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/05 05:58:11 UTC

[camel] branch master updated (52abaee -> 59baf71)

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 52abaee  Regen for commit 0e49cc5e70527d37ab47c8da03f427ae2e6f89fd
     new ec37412  Upgrade AWS SDK v2 to version 2.15.76
     new 59baf71  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                           |  2 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd    | 20 ++------------------
 parent/pom.xml                                       |  2 +-
 3 files changed, 4 insertions(+), 20 deletions(-)


[camel] 01/02: Upgrade AWS SDK v2 to version 2.15.76

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 ec37412209b90d31cfbddca468d4424a25fc9e8f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 5 06:51:47 2021 +0100

    Upgrade AWS SDK v2 to version 2.15.76
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index b982126..96be4f0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
         <avro-ipc-netty-version>1.10.1</avro-ipc-netty-version>
         <awaitility-version>4.0.3</awaitility-version>
         <aws-java-sdk-version>1.11.714</aws-java-sdk-version>
-        <aws-java-sdk2-version>2.15.75</aws-java-sdk2-version>
+        <aws-java-sdk2-version>2.15.76</aws-java-sdk2-version>
         <aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
         <aws-xray-version>2.6.1</aws-xray-version>
         <axiom-version>1.2.14</axiom-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 59baf710e09f37497bcbc78733721d497058bd05
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 5 06:57:33 2021 +0100

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

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 7cceec1..483f58d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -71,7 +71,7 @@
     <awaitility-version>4.0.3</awaitility-version>
     <aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
     <aws-java-sdk-version>1.11.714</aws-java-sdk-version>
-    <aws-java-sdk2-version>2.15.75</aws-java-sdk2-version>
+    <aws-java-sdk2-version>2.15.76</aws-java-sdk2-version>
     <aws-xray-version>2.6.1</aws-xray-version>
     <axiom-version>1.2.14</axiom-version>
     <azure-eventhubs-checkpointstore-blob-version>1.3.1</azure-eventhubs-checkpointstore-blob-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[