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 b377bc8cca9ab62a723c86cc18a71e13622ad22c Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Dec 18 09:49:18 2020 +0100 Sync deps --- 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 4d1732f..dff8b80 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -399,7 +399,7 @@ <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version> <maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version> <maven-model-version>3.2.5</maven-model-version> - <maven-owasp-plugin-version>5.3.2</maven-owasp-plugin-version> + <maven-owasp-plugin-version>6.0.3</maven-owasp-plugin-version> <maven-plugin-annotations-version>3.6.0</maven-plugin-annotations-version> <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version> <maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-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>
