This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit fbc687b6cdfe78a9678884586841882416c466df Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Jun 22 13:09:20 2021 +0200 Sync deps and regen catalog --- camel-dependencies/pom.xml | 2 +- .../org/apache/camel/catalog/dataformats/csv.json | 1 - .../resources/org/apache/camel/catalog/models/csv.json | 1 - .../org/apache/camel/catalog/models/removeHeader.json | 3 +-- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 17 +---------------- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index ab46321..a6d2c75 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -41,7 +41,7 @@ <apache-gora-version>0.9</apache-gora-version> <apacheds-version>2.0.0.AM26</apacheds-version> <apicurio-version>1.0.16.Final</apicurio-version> - <arangodb-java-version>6.12.1</arangodb-java-version> + <arangodb-java-version>6.12.2</arangodb-java-version> <aries-blueprint-api-version>1.0.1</aries-blueprint-api-version> <aries-blueprint-cm-version>1.3.0</aries-blueprint-cm-version> <aries-blueprint-core-version>1.10.0</aries-blueprint-core-version> diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json index 1dfd5dc..cbf061c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json @@ -44,7 +44,6 @@ "useMaps": { "kind": "attribute", "displayName": "Use Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps (HashMap)for the lines values instead of lists. It requires to have header (either defined or collected)." }, "useOrderedMaps": { "kind": "attribute", "displayName": "Use Ordered Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the lines values instead of lists. It requires to have header (either defined or collected)." }, "recordConverterRef": { "kind": "attribute", "displayName": "Record Converter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a custom CsvRecordConverter to lookup from the registry to use." }, - "captureHeaderRecord": { "kind": "attribute", "displayName": "Capture Header Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should capture the header record and store it in the message header" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csv.json index c1fcfba..12099b7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csv.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csv.json @@ -40,7 +40,6 @@ "useMaps": { "kind": "attribute", "displayName": "Use Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps (HashMap)for the lines values instead of lists. It requires to have header (either defined or collected)." }, "useOrderedMaps": { "kind": "attribute", "displayName": "Use Ordered Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the lines values instead of lists. It requires to have header (either defined or collected)." }, "recordConverterRef": { "kind": "attribute", "displayName": "Record Converter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a custom CsvRecordConverter to lookup from the registry to use." }, - "captureHeaderRecord": { "kind": "attribute", "displayName": "Capture Header Record", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should capture the header record and store it in the message header" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" } } } diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json index 5fb3ba1..dd89c3a 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json @@ -11,8 +11,7 @@ "output": false }, "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to remove" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Name of header to remove (deprecated use name instead)" }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to remove" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } } 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 715f21e..b4bd2cb 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 @@ -6703,14 +6703,6 @@ Refers to a custom CsvRecordConverter to lookup from the registry to use. ]]></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="captureHeaderRecord" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Whether the unmarshalling should capture the header record and store it in the -message header. Default value: false - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> </xs:complexContent> </xs:complexType> @@ -10139,20 +10131,13 @@ backward compatibility. Default value: false <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> <xs:sequence/> - <xs:attribute name="name" type="xs:string"> + <xs:attribute name="headerName" type="xs:string" use="required"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ Name of header to remove. ]]></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="headerName" type="xs:string"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Deprecated: Name of header to remove (deprecated use name instead). - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> </xs:complexContent> </xs:complexType>