You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/01/25 05:53:05 UTC

[camel] branch master updated (78e62de -> 48681f9)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 78e62de  CAMEL-16072: Nicer log summary of startup and shutdown of Camel
     new fd86e39  Upgrade Johnzon to version 1.2.10
     new a9fcea4  Fixed tests
     new 48681f9  Regen and sync deps

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 camel-dependencies/pom.xml                                        | 2 +-
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd   | 8 --------
 .../org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java | 2 +-
 parent/pom.xml                                                    | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)


[camel] 01/03: Upgrade Johnzon to version 1.2.10

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fd86e39a86918dd69be991a61b682642c3644ce3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 25 06:33:12 2021 +0100

    Upgrade Johnzon to version 1.2.10
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 40abace..78bf543 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -330,7 +330,7 @@
         <jool-version>0.9.12</jool-version>
         <jooq-version>3.14.4</jooq-version>
         <joor-version>0.9.13</joor-version>
-        <johnzon-version>1.2.8</johnzon-version>
+        <johnzon-version>1.2.10</johnzon-version>
         <jose4j-version>0.6.4</jose4j-version>
         <jsendnsca-version>2.1.1</jsendnsca-version>
         <jslt-version>0.1.11</jslt-version>


[camel] 03/03: Regen and sync deps

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 48681f9ec80141d7590ba8d56340af6ed745e730
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 25 06:52:05 2021 +0100

    Regen and sync deps
---
 camel-dependencies/pom.xml                                        | 2 +-
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 6f9a476..6629fe0 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -340,7 +340,7 @@
     <jmh-version>1.26</jmh-version>
     <jnats-version>2.8.0</jnats-version>
     <jodatime2-bundle-version>2.10.6</jodatime2-bundle-version>
-    <johnzon-version>1.2.8</johnzon-version>
+    <johnzon-version>1.2.10</johnzon-version>
     <jolokia-version>1.6.2</jolokia-version>
     <jolt-version>0.1.1</jolt-version>
     <jool-version>0.9.12</jool-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index efd3087..2167e5e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -2609,14 +2609,6 @@ this and can report the Camel application as DOWN. Default value: false
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="loggingLevel" type="xs:string">
-          <xs:annotation>
-            <xs:documentation xml:lang="en"><![CDATA[
-Sets the logging level used for logging route activity (such as starting and
-stopping routes). The default logging level is DEBUG. Default value: DEBUG
-            ]]></xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>


[camel] 02/03: Fixed tests

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a9fcea423e970ad94a254ad291dae7b68ecda4dd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 25 06:36:47 2021 +0100

    Fixed tests
---
 .../java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java
index 9c87522..225d74e 100644
--- a/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java
+++ b/components/camel-jsonb/src/test/java/org/apache/camel/component/jsonb/JsonbAttributeOrderTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class JsonbAttributeOrderTest extends CamelTestSupport {
 
     final String expectedJson
-            = "{\"bg\":123.123,\"bool\":true,\"doubleNumber\":123.123,\"floatNumber\":123.0,\"intNumber\":123,\"longNumber\":123}";
+            = "{\"bg\":\"123.123\",\"bool\":true,\"doubleNumber\":123.123,\"floatNumber\":123.0,\"intNumber\":123,\"longNumber\":123}";
 
     @Test
     public void testMarshalAndUnmarshalMap() throws Exception {