You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/12/02 07:33:53 UTC
[camel-quarkus] 01/01: Upgrade Camel to 3.14.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c5ec787ef7e5c24cbbbcfba0a42d05cfb82ea2a6
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 18 07:31:39 2021 +0000
Upgrade Camel to 3.14.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 4 ++--
docs/antora.yml | 6 +++---
.../camel/quarkus/component/kafka/QuarkusKafkaClientFactory.java | 8 ++++----
.../salesforce/src/test/resources/mappings/bulApi-abortJob.json | 2 +-
.../salesforce/src/test/resources/mappings/bulkApi-createJob.json | 2 +-
.../salesforce/src/test/resources/mappings/getAccount.json | 2 +-
.../src/test/resources/mappings/getAccountBasicInfo.json | 4 ++--
.../salesforce/src/test/resources/mappings/getAccountById.json | 2 +-
.../src/test/resources/mappings/getAccountDescription.json | 4 ++--
.../src/test/resources/mappings/getAccountLongQuery.json | 2 +-
.../salesforce/src/test/resources/mappings/getDocument.json | 2 +-
.../salesforce/src/test/resources/mappings/getLimits.json | 2 +-
.../salesforce/src/test/resources/mappings/getListOfObjects.json | 4 ++--
.../salesforce/src/test/resources/mappings/getRestResources.json | 4 ++--
.../salesforce/src/test/resources/mappings/handshake.json | 2 +-
.../salesforce/src/test/resources/mappings/setAccount.json | 2 +-
pom.xml | 6 +++---
18 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index 97ac4b9..e23d3ef 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com:apache/camel.git
branches:
- - camel-3.13.x # replace ${camel.docs.branch}
+ - camel-3.14.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index da9b4b1..be4ea34 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -33,7 +33,7 @@ content:
# The version/branch of main camel 'components' this version of camel-quarkus uses
- url: https://github.com/apache/camel.git
branches:
- - camel-3.13.x # replace ${camel.docs.branch}
+ - camel-3.14.x # replace ${camel.docs.branch}
start_paths:
# eip
- core/camel-core-engine/src/main/docs
@@ -50,7 +50,7 @@ content:
# The camel-spring-boot version corresponding to the main camel 'components' version/branch
- url: https://github.com/apache/camel-spring-boot.git
branches:
- - camel-spring-boot-3.13.x # replace ${camel.sb.docs.branch}
+ - camel-spring-boot-3.14.x # replace ${camel.sb.docs.branch}
start_path: docs/components
asciidoc:
diff --git a/docs/antora.yml b/docs/antora.yml
index bc1bbc6..637cdee 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -26,11 +26,11 @@ asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
- camel-version: 3.13.0 # replace ${camel.version}
+ camel-version: 3.14.0-SNAPSHOT # replace ${camel.version}
quarkus-version: 2.5.0.Final # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
- cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref}
+ cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
# indexTable common
- indexer-version: 3.13.x # replace ${camel.docs.components.version}
+ indexer-version: 3.14.x # replace ${camel.docs.components.version}
indexer-component: components
diff --git a/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/QuarkusKafkaClientFactory.java b/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/QuarkusKafkaClientFactory.java
index fda71cf..2c81a9b 100644
--- a/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/QuarkusKafkaClientFactory.java
+++ b/extensions/kafka/runtime/src/main/java/org/apache/camel/quarkus/component/kafka/QuarkusKafkaClientFactory.java
@@ -22,8 +22,8 @@ import java.util.Properties;
import org.apache.camel.component.kafka.DefaultKafkaClientFactory;
import org.apache.camel.component.kafka.KafkaConfiguration;
import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
/**
* Custom {@link org.apache.camel.component.kafka.KafkaClientFactory} to enable Kafka configuration properties
@@ -39,13 +39,13 @@ public class QuarkusKafkaClientFactory extends DefaultKafkaClientFactory {
}
@Override
- public KafkaProducer getProducer(Properties camelKafkaProperties) {
+ public Producer getProducer(Properties camelKafkaProperties) {
mergeConfiguration(camelKafkaProperties);
return super.getProducer(camelKafkaProperties);
}
@Override
- public KafkaConsumer getConsumer(Properties camelKafkaProperties) {
+ public Consumer getConsumer(Properties camelKafkaProperties) {
mergeConfiguration(camelKafkaProperties);
return super.getConsumer(camelKafkaProperties);
}
diff --git a/integration-tests/salesforce/src/test/resources/mappings/bulApi-abortJob.json b/integration-tests/salesforce/src/test/resources/mappings/bulApi-abortJob.json
index 0230ce0..bc21ca6 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/bulApi-abortJob.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/bulApi-abortJob.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/async/50.0/job/750x0000000005LAAQ",
+ "url": "/services/async/53.0/job/750x0000000005LAAQ",
"method": "POST"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/bulkApi-createJob.json b/integration-tests/salesforce/src/test/resources/mappings/bulkApi-createJob.json
index 3b5e29e..e6a16db 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/bulkApi-createJob.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/bulkApi-createJob.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/async/50.0/job",
+ "url": "/services/async/53.0/job",
"method": "POST"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getAccount.json b/integration-tests/salesforce/src/test/resources/mappings/getAccount.json
index ca2f724..1b5189a 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getAccount.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getAccount.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/query/?q=SELECT%20Id%2C%20AccountNumber%20FROM%20Account%20WHERE%20Id%20%3D%20%27001D000000IqhSLIAZ%27",
+ "url": "/services/data/v53.0/query/?q=SELECT%20Id%2C%20AccountNumber%20FROM%20Account%20WHERE%20Id%20%3D%20%27001D000000IqhSLIAZ%27",
"method": "GET"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getAccountBasicInfo.json b/integration-tests/salesforce/src/test/resources/mappings/getAccountBasicInfo.json
index 0bd6d7f..fe85368 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getAccountBasicInfo.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getAccountBasicInfo.json
@@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/Account/",
+ "url": "/services/data/v53.0/sobjects/Account/",
"method": "GET"
},
"response": {
"status": 200,
- "body" : "{\"objectDescribe\":{\"name\":\"Account\",\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"replicateable\":true,\"retrieveable\":true,\"undeletable\":true,\"triggerable\":true},\"recentItems\":[{\"attributes\":{\"type\":\"Account\",\"url\":\"\/services\/data\/v50.0\/sobjects\/Account\/001D000000IqhSLIAZ\"},\"Id\":\"001D000000IqhSLIAZ\",\"Name\":\"asdasdasd\"}]}",
+ "body" : "{\"objectDescribe\":{\"name\":\"Account\",\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"replicateable\":true,\"retrieveable\":true,\"undeletable\":true,\"triggerable\":true},\"recentItems\":[{\"attributes\":{\"type\":\"Account\",\"url\":\"\/services\/data\/v53.0\/sobjects\/Account\/001D000000IqhSLIAZ\"},\"Id\":\"001D000000IqhSLIAZ\",\"Name\":\"asdasdasd\"}]}",
"headers": {
"Content-Type": "application/json; charset=UTF-8"
}
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getAccountById.json b/integration-tests/salesforce/src/test/resources/mappings/getAccountById.json
index 91df379..7eecc2e 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getAccountById.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getAccountById.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/Account/Id/001D000000IqhSLIAZ",
+ "url": "/services/data/v53.0/sobjects/Account/Id/001D000000IqhSLIAZ",
"method": "GET"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getAccountDescription.json b/integration-tests/salesforce/src/test/resources/mappings/getAccountDescription.json
index 114ddf0..0984caf 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getAccountDescription.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getAccountDescription.json
@@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/Account/describe/",
+ "url": "/services/data/v53.0/sobjects/Account/describe/",
"method": "GET"
},
"response": {
"status": 200,
- "body": "{\"name\":\"Account\",\"fields\":[{\"length\":18,\"name\":\"Id\",\"type\":\"id\",\"updateable\":false,\"label\":\"Account ID\"}],\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"custom\":false,\"urls\":{\"uiEditTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\/e\",\"sobject\":\"\/services\/data\/v50.0\/sobjects\/Account\",\"uiDetailTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\"},\"childRelationships\":[{\"field\":\"ParentId\",\"deprecated [...]
+ "body": "{\"name\":\"Account\",\"fields\":[{\"length\":18,\"name\":\"Id\",\"type\":\"id\",\"updateable\":false,\"label\":\"Account ID\"}],\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"custom\":false,\"urls\":{\"uiEditTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\/e\",\"sobject\":\"\/services\/data\/v53.0\/sobjects\/Account\",\"uiDetailTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\"},\"childRelationships\":[{\"field\":\"ParentId\",\"deprecated [...]
"headers": {
"Content-Type": "application/json; charset=UTF-8"
}
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json b/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
index c8d31c9..de3c16c 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getAccountLongQuery.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20 [...]
+ "url": "/services/data/v53.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20 [...]
"method": "GET"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getDocument.json b/integration-tests/salesforce/src/test/resources/mappings/getDocument.json
index aac6d77..4865fbd48 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getDocument.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getDocument.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/Document/Name/test",
+ "url": "/services/data/v53.0/sobjects/Document/Name/test",
"method": "GET"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getLimits.json b/integration-tests/salesforce/src/test/resources/mappings/getLimits.json
index 6c33e5c..76c9d88 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getLimits.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getLimits.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/limits/",
+ "url": "/services/data/v53.0/limits/",
"method": "GET"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getListOfObjects.json b/integration-tests/salesforce/src/test/resources/mappings/getListOfObjects.json
index cc4e909..3e589ce 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getListOfObjects.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getListOfObjects.json
@@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/",
+ "url": "/services/data/v53.0/sobjects/",
"method": "GET"
},
"response": {
"status": 200,
- "body" : "{\"encoding\":\"UTF-8\",\"maxBatchSize\":200,\"sobjects\":[{\"activateable\":false,\"custom\":false,\"customSetting\":false,\"createable\":true,\"deletable\":true,\"deprecatedAndHidden\":false,\"feedEnabled\":true,\"keyPrefix\":\"001\",\"label\":\"Account\",\"labelPlural\":\"Accounts\",\"layoutable\":true,\"mergeable\":true,\"mruEnabled\":true,\"name\":\"Account\",\"queryable\":true,\"replicateable\":true,\"retrieveable\":true,\"searchable\":true,\"triggerable\":true,\"unde [...]
+ "body" : "{\"encoding\":\"UTF-8\",\"maxBatchSize\":200,\"sobjects\":[{\"activateable\":false,\"custom\":false,\"customSetting\":false,\"createable\":true,\"deletable\":true,\"deprecatedAndHidden\":false,\"feedEnabled\":true,\"keyPrefix\":\"001\",\"label\":\"Account\",\"labelPlural\":\"Accounts\",\"layoutable\":true,\"mergeable\":true,\"mruEnabled\":true,\"name\":\"Account\",\"queryable\":true,\"replicateable\":true,\"retrieveable\":true,\"searchable\":true,\"triggerable\":true,\"unde [...]
"headers": {
"Content-Type": "application/json; charset=UTF-8",
"Sforce-Limit-Info": "api-usage=18/5000"
diff --git a/integration-tests/salesforce/src/test/resources/mappings/getRestResources.json b/integration-tests/salesforce/src/test/resources/mappings/getRestResources.json
index b023116..53cbdbc 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/getRestResources.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/getRestResources.json
@@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/",
+ "url": "/services/data/v53.0/",
"method": "GET"
},
"response": {
"status": 200,
- "body": "{\"sobjects\":\"\/services\/data\/v50.0\/sobjects\",\"licensing\":\"\/services\/data\/v50.0\/licensing\",\"connect\":\"\/services\/data\/v50.0\/connect\",\"search\":\"\/services\/data\/v50.0\/search\",\"query\":\"\/services\/data\/v50.0\/query\",\"tooling\":\"\/services\/data\/v50.0\/tooling\",\"chatter\":\"\/services\/data\/v50.0\/chatter\",\"recent\":\"\/services\/data\/v50.0\/recent\"}",
+ "body": "{\"sobjects\":\"\/services\/data\/v53.0\/sobjects\",\"licensing\":\"\/services\/data\/v53.0\/licensing\",\"connect\":\"\/services\/data\/v53.0\/connect\",\"search\":\"\/services\/data\/v53.0\/search\",\"query\":\"\/services\/data\/v53.0\/query\",\"tooling\":\"\/services\/data\/v53.0\/tooling\",\"chatter\":\"\/services\/data\/v53.0\/chatter\",\"recent\":\"\/services\/data\/v53.0\/recent\"}",
"headers": {
"Content-Type": "application/json; charset=UTF-8",
"Sforce-Limit-Info": "api-usage=18/5000"
diff --git a/integration-tests/salesforce/src/test/resources/mappings/handshake.json b/integration-tests/salesforce/src/test/resources/mappings/handshake.json
index e619cba..57fef5a 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/handshake.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/handshake.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/cometd/50.0/handshake",
+ "url": "/cometd/53.0/handshake",
"method": "POST"
},
"response": {
diff --git a/integration-tests/salesforce/src/test/resources/mappings/setAccount.json b/integration-tests/salesforce/src/test/resources/mappings/setAccount.json
index a52281f..f7922f4 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/setAccount.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/setAccount.json
@@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
- "url": "/services/data/v50.0/sobjects/Account",
+ "url": "/services/data/v53.0/sobjects/Account",
"method": "POST"
},
"response": {
diff --git a/pom.xml b/pom.xml
index 5f2cff6..d5cd912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.13.0</version>
+ <version>3.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,8 +39,8 @@
<properties>
<!-- Primary dependencies - maintained manually -->
- <camel.major.minor>3.13</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.0</camel.version>
+ <camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
+ <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->