You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/03/26 07:44:46 UTC
[camel-spring-boot] 02/04: Dependency upgrades and regen
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-spring-boot.git
commit 58ae11b3e4c807822b7e67a9c691c111bdd39d68
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 26 08:24:30 2022 +0100
Dependency upgrades and regen
---
.../camel/springboot/catalog/components/salesforce.json | 1 +
.../camel-salesforce-starter/src/main/docs/salesforce.json | 7 +++++++
.../springboot/SalesforceComponentConfiguration.java | 12 ++++++++++++
pom.xml | 8 ++++----
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 5cac4e8..c924daf 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -37,6 +37,7 @@
"httpClientIdleTimeout": { "kind": "property", "displayName": "Http Client Idle Timeout", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 10000, "description": "Timeout used by the HttpClient when waiting for response from the Salesforce server." },
"httpMaxContentLength": { "kind": "property", "displayName": "Http Max Content Length", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Max content length of an HTTP response." },
"httpRequestBufferSize": { "kind": "property", "displayName": "Http Request Buffer Size", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "description": "HTTP request buffer size. May need to be increased for large SOQL queries." },
+ "httpRequestTimeout": { "kind": "property", "displayName": "Http Request Timeout", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 60000, "description": "Timeout value for HTTP requests." },
"includeDetails": { "kind": "property", "displayName": "Include Details", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Include details in Salesforce1 Analytics report, defaults to false." },
"initialReplayIdMap": { "kind": "property", "displayName": "Initial Replay Id Map", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Long>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Replay IDs to start from per channel name." },
"instanceId": { "kind": "property", "displayName": "Instance Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.salesforce.SalesforceEndpointConfig", "configurationField": "config", "description": "Salesforce1 Analytics report execution instance ID" },
diff --git a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
index bdfd777..6d5d0a4 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce.json
@@ -248,6 +248,13 @@
"defaultValue": 8192
},
{
+ "name": "camel.component.salesforce.http-request-timeout",
+ "type": "java.lang.Long",
+ "description": "Timeout value for HTTP requests.",
+ "sourceType": "org.apache.camel.component.salesforce.springboot.SalesforceComponentConfiguration",
+ "defaultValue": 60000
+ },
+ {
"name": "camel.component.salesforce.include-details",
"type": "java.lang.Boolean",
"description": "Include details in Salesforce1 Analytics report, defaults to false.",
diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 4890293..eede6cf 100644
--- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -116,6 +116,10 @@ public class SalesforceComponentConfiguration
*/
private Integer httpRequestBufferSize = 8192;
/**
+ * Timeout value for HTTP requests.
+ */
+ private Long httpRequestTimeout = 60000L;
+ /**
* Include details in Salesforce1 Analytics report, defaults to false.
*/
private Boolean includeDetails;
@@ -636,6 +640,14 @@ public class SalesforceComponentConfiguration
this.httpRequestBufferSize = httpRequestBufferSize;
}
+ public Long getHttpRequestTimeout() {
+ return httpRequestTimeout;
+ }
+
+ public void setHttpRequestTimeout(Long httpRequestTimeout) {
+ this.httpRequestTimeout = httpRequestTimeout;
+ }
+
public Boolean getIncludeDetails() {
return includeDetails;
}
diff --git a/pom.xml b/pom.xml
index befdcd0..d37c808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,19 +120,19 @@
<asciidoctorj-version>2.3.0</asciidoctorj-version>
<avro-version>1.8.1</avro-version>
<glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
- <groovy-version>3.0.6</groovy-version>
+ <groovy-version>3.0.10</groovy-version>
<hadoop2-version>2.7.4</hadoop2-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
<jaxb-version>2.3.0</jaxb-version>
- <jetty9-version>9.4.32.v20200930</jetty9-version>
+ <jetty9-version>9.4.45.v20220203</jetty9-version>
<maven-compiler-plugin-version>3.10.1</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version>
<mycila-license-version>3.0</mycila-license-version>
- <springdoc-version>1.5.12</springdoc-version>
+ <springdoc-version>1.6.6</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.0.28</swagger-parser-v3-version>
- <undertow-version>2.2.0.Final</undertow-version>
+ <undertow-version>2.2.16.Final</undertow-version>
</properties>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index bf64679..f86fc6b 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4506,7 +4506,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>