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/23 14:15:00 UTC
[camel] branch master updated (b52d5f2 -> c52ea3d)
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 b52d5f2 CAMEL-15984: Added note in migration docs
new bd55284 Upgrade AWS SDK v2 to version 2.15.52
new c52ea3d 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 | 81 +---------------------
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 81 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 c52ea3d8630ba106d3d0c4361b808273137748cb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 23 15:14:08 2020 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +---------------------
2 files changed, 3 insertions(+), 80 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 304eccf..cb462f4 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.50</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.52</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 0530ef7..a4e492f 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>
@@ -5586,14 +5587,6 @@ null. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="breakOnShutdown" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-If the breakOnShutdown attribute is true, then the loop will not iterate until
-it reaches the end when Camel is shut down. Default value: false
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6449,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>
@@ -6742,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>
@@ -6911,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>
@@ -7100,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>
@@ -7224,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>
@@ -7505,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>
@@ -7826,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>
@@ -12184,7 +12107,7 @@ ServiceCallConstants.SERVICE_PORT. Default value: CamelServiceCallServicePort
<xs:element ref="tns:ribbonLoadBalancer"/>
<xs:element ref="tns:defaultLoadBalancer"/>
</xs:choice>
- <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration"/>
+ <xs:element minOccurs="0" name="expressionConfiguration" type="tns:serviceCallExpressionConfiguration"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string">
<xs:annotation>
[camel] 01/02: Upgrade AWS SDK v2 to version 2.15.52
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 bd552846a7fa76527f28d52f71af0a3f880d2016
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 23 14:59:31 2020 +0100
Upgrade AWS SDK v2 to version 2.15.52
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a844417..7b15c0d 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.50</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.52</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>