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 2020/12/16 06:41:21 UTC
[camel] branch master updated (dd9ff66 -> 87d107e)
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 dd9ff66 CAMEL-15946: Fix javadoc WARN about javax.annotation
new 62768e6 Upgrade AWS SDK v2 to version 2.15.47
new 87d107e 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 | 71 +---------------------
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 72 deletions(-)
[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 87d107efd2a98944950c78bbc9c15ac9cf8c164c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 16 07:40:48 2020 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 71 +---------------------
2 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 6786a9a..4401ca6 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.46</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.47</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.2.0</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 2a6a255..feb800e 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
@@ -4374,6 +4374,7 @@ To use a specific charset when converting.
<xs:complexContent>
<xs:extension base="tns:identifiedType">
<xs:sequence/>
+ <xs:attribute name="contentTypeHeader" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6441,16 +6442,6 @@ true (which is the default).
<xs:list itemType="xs:string"/>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6734,16 +6725,6 @@ enabled when desired to be used. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6903,16 +6884,6 @@ JAXB provider properties to be used with the JAXB marshaller.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7092,16 +7063,6 @@ Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7216,16 +7177,6 @@ value is native. Default value: native
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7497,16 +7448,6 @@ representation. The default value is binary. Default value: binary
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7818,16 +7759,6 @@ SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
[camel] 01/02: Upgrade AWS SDK v2 to version 2.15.47
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 62768e66a781e2dec85fd73fe73be4f6c5ced876
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 16 07:35:40 2020 +0100
Upgrade AWS SDK v2 to version 2.15.47
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0cc5871..c8d445a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<avro-ipc-netty-version>1.10.0</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.46</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.47</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>