This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.4.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5d3199b5e9bcf832bccfd90ad32a442ff907f29e Author: Claus Ibsen <[email protected]> AuthorDate: Sun Aug 9 20:23:25 2020 +0200 Regen --- camel-dependencies/pom.xml | 6 +++--- .../resources/org/apache/camel/component/salesforce/salesforce.json | 2 +- .../src/main/docs/salesforce-component.adoc | 2 +- .../builder/component/dsl/SalesforceComponentBuilderFactory.java | 1 + docs/components/modules/ROOT/pages/salesforce-component.adoc | 2 +- parent/pom.xml | 6 +++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 9769391..53af12b 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -523,15 +523,15 @@ <solr-version-range>[8,9)</solr-version-range> <spark-version>2.4.6</spark-version> <splunk-version>1.6.5.0_1</splunk-version> - <spring-batch-version>4.2.2.RELEASE</spring-batch-version> + <spring-batch-version>4.2.4.RELEASE</spring-batch-version> <spring-data-redis-version>2.3.0.RELEASE</spring-data-redis-version> <spring-integration-version>5.3.0.RELEASE</spring-integration-version> <spring-ldap-version>2.3.3.RELEASE</spring-ldap-version> - <spring-security-version>5.3.2.RELEASE</spring-security-version> + <spring-security-version>5.3.3.RELEASE</spring-security-version> <spring-version>${spring5-version}</spring-version> <spring-version-range>[5,6)</spring-version-range> <spring-ws-version>3.0.9.RELEASE</spring-ws-version> - <spring5-version>5.2.7.RELEASE</spring5-version> + <spring5-version>5.2.8.RELEASE</spring5-version> <sql-maven-plugin-version>1.5</sql-maven-plugin-version> <squareup-okhttp-version>3.14.7</squareup-okhttp-version> <squareup-okio-version>1.17.2</squareup-okio-version> diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json index 9f1aeae..fe1103e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json +++ b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json @@ -49,7 +49,7 @@ "notifyForOperationUndelete": { "kind": "property", "displayName": "Notify For Operation Undelete", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Notify for un-delete operation, defaults to false (API version = 29.0)" }, "notifyForOperationUpdate": { "kind": "property", "displayName": "Notify For Operation Update", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Notify for update operation, defaults to false (API version = 29.0)" }, "objectMapper": { "kind": "property", "displayName": "Object Mapper", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.fasterxml.jackson.databind.ObjectMapper", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Custom Jackson ObjectMapper to use when serializing\/deserializing Salesforce objects." }, - "packages": { "kind": "property", "displayName": "Packages", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be s [...] + "packages": { "kind": "property", "displayName": "Packages", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "secret": false, "description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be se [...] "rawPayload": { "kind": "property", "displayName": "Raw Payload", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default" }, "reportId": { "kind": "property", "displayName": "Report Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Salesforce1 Analytics report Id" }, "reportMetadata": { "kind": "property", "displayName": "Report Metadata", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Salesforce1 Analytics report metadata for filtering" }, diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc index c83d9a9..e4672f2 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc +++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc @@ -689,7 +689,7 @@ The Salesforce component supports 72 options, which are listed below. | *notifyForOperationUndelete* (common) | Notify for un-delete operation, defaults to false (API version = 29.0) | | Boolean | *notifyForOperationUpdate* (common) | Notify for update operation, defaults to false (API version = 29.0) | | Boolean | *objectMapper* (common) | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | | ObjectMapper -| *packages* (common) | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String +| *packages* (common) | *Deprecated* In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String | *rawPayload* (common) | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | boolean | *reportId* (common) | Salesforce1 Analytics report Id | | String | *reportMetadata* (common) | Salesforce1 Analytics report metadata for filtering | | ReportMetadata diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java index 00b35c3..52776d0 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java @@ -406,6 +406,7 @@ public interface SalesforceComponentBuilderFactory { * * Group: common */ + @Deprecated default SalesforceComponentBuilder packages(java.lang.String packages) { doSetProperty("packages", packages); return this; diff --git a/docs/components/modules/ROOT/pages/salesforce-component.adoc b/docs/components/modules/ROOT/pages/salesforce-component.adoc index 7c94784..fbb0c9c 100644 --- a/docs/components/modules/ROOT/pages/salesforce-component.adoc +++ b/docs/components/modules/ROOT/pages/salesforce-component.adoc @@ -691,7 +691,7 @@ The Salesforce component supports 72 options, which are listed below. | *notifyForOperationUndelete* (common) | Notify for un-delete operation, defaults to false (API version = 29.0) | | Boolean | *notifyForOperationUpdate* (common) | Notify for update operation, defaults to false (API version = 29.0) | | Boolean | *objectMapper* (common) | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | | ObjectMapper -| *packages* (common) | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String +| *packages* (common) | *Deprecated* In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | | String | *rawPayload* (common) | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | boolean | *reportId* (common) | Salesforce1 Analytics report Id | | String | *reportMetadata* (common) | Salesforce1 Analytics report metadata for filtering | | ReportMetadata diff --git a/parent/pom.xml b/parent/pom.xml index a4cef07..cee1a52 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -510,14 +510,14 @@ <solr-version-range>[8,9)</solr-version-range> <spark-version>2.4.6</spark-version> <splunk-version>1.6.5.0_1</splunk-version> - <spring-batch-version>4.2.2.RELEASE</spring-batch-version> + <spring-batch-version>4.2.4.RELEASE</spring-batch-version> <spring-data-redis-version>2.3.0.RELEASE</spring-data-redis-version> <spring-integration-version>5.3.0.RELEASE</spring-integration-version> <spring-ldap-version>2.3.3.RELEASE</spring-ldap-version> <spring-version-range>[5,6)</spring-version-range> <spring-version>${spring5-version}</spring-version> - <spring5-version>5.2.7.RELEASE</spring5-version> - <spring-security-version>5.3.2.RELEASE</spring-security-version> + <spring5-version>5.2.8.RELEASE</spring5-version> + <spring-security-version>5.3.3.RELEASE</spring-security-version> <spring-ws-version>3.0.9.RELEASE</spring-ws-version> <sql-maven-plugin-version>1.5</sql-maven-plugin-version> <squareup-okhttp-version>3.14.7</squareup-okhttp-version>
