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 93d42d96a325f15760fb3bfc2f47a0e1a0c8d4c4 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Dec 18 08:29:47 2020 +0100 Sync deps and regen --- camel-dependencies/pom.xml | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 77 ++-------------------- 2 files changed, 5 insertions(+), 74 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 8893e24..d651dac 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.48</aws-java-sdk2-version> + <aws-java-sdk2-version>2.15.49</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 3a8d28f..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> @@ -12774,9 +12705,9 @@ can be prevented by turning this option on. Default value: false Whether to enable pre-compiling the xpath expression during initialization phase. pre-compile is enabled by default. This can be used to turn off, for example in cases the compilation phase is desired at the starting phase, such as -if the application is ahead of time compiled (for example with camel-quarkus) -which would then load the xpath factory of the built operating system, and not a -JVM runtime. Default value: true +if the application is pre-built with graalvm which would then load the xpath +factory of the built operating system, and not a JVM runtime. Default value: +true ]]></xs:documentation> </xs:annotation> </xs:attribute>