Skip to content

Commit

Permalink
⬆️ Upgrade Camel to 3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnetherton authored and zbendhiba committed Dec 18, 2021
1 parent 4b4228e commit 87e3759
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 46 deletions.
6 changes: 3 additions & 3 deletions docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.13.0 # replace ${camel.version}
camel-version: 3.14.0 # replace ${camel.version}
quarkus-version: 2.6.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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Camel Azure Datalake Gen2 Component

== What's inside

* xref:{cq-camel-components}::azure-storage-datalake-component.adoc[Azure storage datalake service component], URI syntax: `azure-storage-datalake:accountName/fileSystemName`
* xref:{cq-camel-components}::azure-storage-datalake-component.adoc[Azure Storage Datalake Service component], URI syntax: `azure-storage-datalake:accountName/fileSystemName`

Please refer to the above link for usage and configuration details.

Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/pages/reference/extensions/vertx-kafka.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
:cq-artifact-id: camel-quarkus-vertx-kafka
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-status-deprecation: Stable Deprecated
:cq-description: Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client
:cq-deprecated: false
:cq-deprecated: true
:cq-jvm-since: 1.6.0
:cq-native-since: 1.6.0

[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.6.0## [.badge-key]##Native since##[.badge-supported]##1.6.0##
[.badge-key]##JVM since##[.badge-supported]##1.6.0## [.badge-key]##Native since##[.badge-supported]##1.6.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##

Sent and receive messages to/from an Apache Kafka broker using vert.x Kafka client

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
:cq-jvm-since: 1.8.0
:cq-native-since: n/a
:cq-camel-part-name: azure-storage-datalake
:cq-camel-part-title: Azure storage datalake service
:cq-camel-part-title: Azure Storage Datalake Service
:cq-camel-part-description: Camel Azure Datalake Gen2 Component
:cq-extension-page-title: Azure storage datalake service
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:cq-artifact-id-base: vertx-kafka
:cq-native-supported: true
:cq-status: Stable
:cq-deprecated: false
:cq-deprecated: true
:cq-jvm-since: 1.6.0
:cq-native-since: 1.6.0
:cq-camel-part-name: vertx-kafka
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
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
Expand All @@ -39,13 +39,13 @@ public QuarkusKafkaClientFactory(Map<String, Object> quarkusKafkaConfiguration)
}

@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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ metadata:
- "integration"
status:
- "stable"
- "deprecated"
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import static org.hamcrest.Matchers.anyOf;
Expand Down Expand Up @@ -140,7 +139,6 @@ private void deleteMessageFromQueue(String queueName, String receipt) {
}

@Test
@Disabled
void sqsAutoCreateDelayedQueue() {
final String qName = "delayQueue-" + RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
final int delay = 20;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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\",\"deprecatedAndHidden\":false}],\"createable\":true,\"customSetting\":false}",
"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\",\"deprecatedAndHidden\":false}],\"createable\":true,\"customSetting\":false}",
"headers": {
"Content-Type": "application/json; charset=UTF-8"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%20ShippingAddress%2C%20Phone%2C%20Fax%2C%20AccountNumber%2C%20Website%2C%20PhotoUrl%2C%20Sic%2C%20Industry%2C%20AnnualRevenue%2C%20NumberOfEmployees%2C%20Ownership%2C%20TickerSymbol%2C%20Description%2C%20Rating%2C%20Site%2C%20OwnerId%2C%20CreatedDate%2C%20CreatedById%2C%20LastModifiedDate%2C%20LastModifiedById%2C%20SystemModstamp%2C%20LastActivityDate%2C%20LastViewedDate%2C%20LastReferencedDate%2C%20Jigsaw%2C%20JigsawCompanyId%2C%20CleanStatus%2C%20AccountSource%2C%20DunsNumber%2C%20Tradestyle%2C%20NaicsCode%2C%20NaicsDesc%2C%20YearStarted%2C%20SicDesc%2C%20DandbCompanyId%2C%20CustomerPriority__c%2C%20SLA__c%2C%20Active__c%2C%20NumberofLocations__c%2C%20UpsellOpportunity__c%2C%20SLASerialNumber__c%2C%20SLAExpirationDate__c%2C%20MyMultiselect__c%20FROM%20Account%20LIMIT%201",
"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%20ShippingAddress%2C%20Phone%2C%20Fax%2C%20AccountNumber%2C%20Website%2C%20PhotoUrl%2C%20Sic%2C%20Industry%2C%20AnnualRevenue%2C%20NumberOfEmployees%2C%20Ownership%2C%20TickerSymbol%2C%20Description%2C%20Rating%2C%20Site%2C%20OwnerId%2C%20CreatedDate%2C%20CreatedById%2C%20LastModifiedDate%2C%20LastModifiedById%2C%20SystemModstamp%2C%20LastActivityDate%2C%20LastViewedDate%2C%20LastReferencedDate%2C%20Jigsaw%2C%20JigsawCompanyId%2C%20CleanStatus%2C%20AccountSource%2C%20DunsNumber%2C%20Tradestyle%2C%20NaicsCode%2C%20NaicsDesc%2C%20YearStarted%2C%20SicDesc%2C%20DandbCompanyId%2C%20CustomerPriority__c%2C%20SLA__c%2C%20Active__c%2C%20NumberofLocations__c%2C%20UpsellOpportunity__c%2C%20SLASerialNumber__c%2C%20SLAExpirationDate__c%2C%20MyMultiselect__c%20FROM%20Account%20LIMIT%201",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,\"undeletable\":true,\"updateable\":true,\"urls\":{\"sobject\":\"\/services\/data\/v50.0\/sobjects\/Account\",\"describe\":\"\/services\/data\/v50.0\/sobjects\/Account\/describe\",\"rowTemplate\":\"\/services\/data\/v50.0\/sobjects\/Account\/{ID}\"}}]}",
"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,\"undeletable\":true,\"updateable\":true,\"urls\":{\"sobject\":\"\/services\/data\/v53.0\/sobjects\/Account\",\"describe\":\"\/services\/data\/v53.0\/sobjects\/Account\/describe\",\"rowTemplate\":\"\/services\/data\/v53.0\/sobjects\/Account\/{ID}\"}}]}",
"headers": {
"Content-Type": "application/json; charset=UTF-8",
"Sforce-Limit-Info": "api-usage=18/5000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
</parent>

<groupId>org.apache.camel.quarkus</groupId>
Expand All @@ -39,7 +39,7 @@
<properties>

<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.13</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
<camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
<camel.version>${camel.major.minor}.0</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 -->
Expand Down
24 changes: 12 additions & 12 deletions poms/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6055,18 +6055,6 @@
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>
<!-- TODO: Remove this https://github.com/apache/camel-quarkus/issues/3366 -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
<version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
Expand Down Expand Up @@ -6333,6 +6321,18 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<!-- TODO: Remove this https://github.com/apache/camel-quarkus/issues/3366 -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
<version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
Expand Down

0 comments on commit 87e3759

Please sign in to comment.