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/02/08 14:01:11 UTC

[camel] branch master updated (5a2d84f -> b8a3ef3)

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 5a2d84f  Revert "Jenkinsfile use adoptopenjdk instead of oracle"
     new 1eb5960  Upgrade Kubernetes client and kubernetes model to version 5.0.2
     new b8a3ef3  Sync deps

The 2 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                           |  4 ++--
 .../apache/camel/catalog/schemas/camel-spring.xsd    | 20 ++------------------
 parent/pom.xml                                       |  4 ++--
 3 files changed, 6 insertions(+), 22 deletions(-)


[camel] 01/02: Upgrade Kubernetes client and kubernetes model to version 5.0.2

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 1eb59605201cc92cefc78ff14fccd2835ae899e7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 8 14:46:53 2021 +0100

    Upgrade Kubernetes client and kubernetes model to version 5.0.2
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index a8cf4a3..7223fdd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -357,8 +357,8 @@
         <jzlib-version>1.1.3</jzlib-version>
         <kafka-version>2.7.0</kafka-version>
         <kie-version>7.49.0.Final</kie-version>
-        <kubernetes-client-version>5.0.1</kubernetes-client-version>
-        <kubernetes-model-version>5.0.1</kubernetes-model-version>
+        <kubernetes-client-version>5.0.2</kubernetes-client-version>
+        <kubernetes-model-version>5.0.2</kubernetes-model-version>
         <kudu-version>1.12.0</kudu-version>
         <leveldbjni-version>1.8</leveldbjni-version>
         <leveldb-api-version>0.10</leveldb-api-version>


[camel] 02/02: 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 b8a3ef31531202d43fbbee1440963ee0e2950b79
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 8 14:51:13 2021 +0100

    Sync deps
---
 camel-dependencies/pom.xml                           |  4 ++--
 .../apache/camel/catalog/schemas/camel-spring.xsd    | 20 ++------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cfa47a7..60c0409 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -374,8 +374,8 @@
     <jzlib-version>1.1.3</jzlib-version>
     <kafka-version>2.7.0</kafka-version>
     <kie-version>7.49.0.Final</kie-version>
-    <kubernetes-client-version>5.0.1</kubernetes-client-version>
-    <kubernetes-model-version>5.0.1</kubernetes-model-version>
+    <kubernetes-client-version>5.0.2</kubernetes-client-version>
+    <kubernetes-model-version>5.0.2</kubernetes-model-version>
     <kudu-version>1.12.0</kudu-version>
     <lettuce-version>5.1.0.RELEASE</lettuce-version>
     <leveldb-api-version>0.10</leveldb-api-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 d7cdfbd..c4815a3 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
@@ -6651,15 +6651,7 @@ Class name of the java type to use when unmarshalling.
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="jsonViewTypeName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
-            ]]></xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
+        <xs:attribute name="jsonView" type="xs:string"/>
         <xs:attribute name="include" type="xs:string">
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
@@ -6974,15 +6966,7 @@ Class name of the java type to use when unmarshalling.
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="jsonViewTypeName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
-            ]]></xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
+        <xs:attribute name="jsonView" type="xs:string"/>
         <xs:attribute name="include" type="xs:string">
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[