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 <[email protected]> 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>
