This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new c8793b8 Upgrade Camel to 3.12.0
c8793b8 is described below
commit c8793b83391e43760985ef62a1ae4854f7a363f6
Author: James Netherton <[email protected]>
AuthorDate: Thu Sep 30 13:35:41 2021 +0100
Upgrade Camel to 3.12.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 4 +-
docs/antora.yml | 2 +-
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 4 +-
.../ROOT/pages/reference/extensions/bean.adoc | 2 +-
.../reference/extensions/elasticsearch-rest.adoc | 4 +-
.../pages/reference/extensions/google-sheets.adoc | 2 +-
.../ROOT/pages/reference/extensions/groovy.adoc | 4 +-
.../ROOT/pages/reference/extensions/hdfs.adoc | 4 +-
.../reference/extensions/huaweicloud-smn.adoc | 2 +-
.../ROOT/pages/reference/extensions/jsonpath.adoc | 6 +--
.../reference/extensions/microprofile-health.adoc | 4 +-
.../ROOT/pages/reference/extensions/netty.adoc | 4 +-
.../ROOT/pages/reference/extensions/ognl.adoc | 4 +-
.../ROOT/pages/reference/extensions/ribbon.adoc | 6 +--
.../ROOT/pages/reference/extensions/xml-jaxp.adoc | 4 +-
.../ROOT/pages/reference/extensions/xpath.adoc | 4 +-
.../partials/reference/components/aws2-sqs.adoc | 2 +-
.../reference/components/elasticsearch-rest.adoc | 2 +-
.../partials/reference/components/hwcloud-dms.adoc | 1 +
.../components/hwcloud-imagerecognition.adoc | 1 +
.../partials/reference/components/hwcloud-obs.adoc | 1 +
.../partials/reference/components/hwcloud-smn.adoc | 2 +-
.../partials/reference/components/json-patch.adoc | 1 +
.../ROOT/partials/reference/components/netty.adoc | 2 +-
.../ROOT/partials/reference/languages/bean.adoc | 4 +-
.../ROOT/partials/reference/languages/csimple.adoc | 2 +-
.../reference/languages/exchangeProperty.adoc | 2 +-
.../ROOT/partials/reference/languages/file.adoc | 2 +-
.../ROOT/partials/reference/languages/groovy.adoc | 2 +-
.../ROOT/partials/reference/languages/header.adoc | 2 +-
.../partials/reference/languages/hl7terser.adoc | 2 +-
.../ROOT/partials/reference/languages/joor.adoc | 2 +-
.../partials/reference/languages/jsonpath.adoc | 4 +-
.../ROOT/partials/reference/languages/mvel.adoc | 2 +-
.../ROOT/partials/reference/languages/ognl.adoc | 2 +-
.../ROOT/partials/reference/languages/ref.adoc | 2 +-
.../ROOT/partials/reference/languages/simple.adoc | 2 +-
.../partials/reference/languages/tokenize.adoc | 2 +-
.../ROOT/partials/reference/languages/xpath.adoc | 2 +-
.../ROOT/partials/reference/languages/xquery.adoc | 2 +-
.../partials/reference/languages/xtokenize.adoc | 2 +-
.../reference/others/microprofile-health.adoc | 2 +-
.../ROOT/partials/reference/others/ribbon.adoc | 2 +-
extensions-jvm/hdfs/runtime/pom.xml | 2 +-
extensions-jvm/spark/bom/pom.xml | 51 ++++++++++++++++++----
.../component/jaxb/deployment/JaxbProcessor.java | 7 ---
.../aws2/ddb/it/Aws2DdbStreamResource.java | 11 -----
.../component/aws2/ddb/it/Aws2DdbStreamRoutes.java | 2 +-
.../aws2/ddb/it/TestSequenceNumberProvider.java | 38 ----------------
.../component/aws2/ddb/it/Aws2DdbStreamTest.java | 24 +++-------
integration-tests-jvm/spark/pom.xml | 2 +-
.../camel/quarkus/component/as2/it/As2Sender.java | 2 +-
.../src/main/resources/routes/gson-routes.xml | 2 +-
.../src/main/resources/routes/jackson-routes.xml | 18 ++++----
.../src/main/resources/routes/johnzon-routes.xml | 2 +-
.../src/main/resources/routes/jsonb-routes.xml | 2 +-
.../google/pubsub/it/GooglePubsubTestResource.java | 1 +
.../component/salesforce/generated/Account.java | 20 ---------
.../salesforce/generated/QueryRecordsAccount.java | 2 -
pom.xml | 17 +++++---
61 files changed, 137 insertions(+), 182 deletions(-)
diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml
index 9001771..d4ab0d0 100644
--- a/docs/antora-playbook-dev.yml
+++ b/docs/antora-playbook-dev.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: [email protected]:apache/camel.git
branches:
- - camel-3.11.x # replace ${camel.docs.branch}
+ - camel-3.12.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- url: [email protected]:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 8cfb385..a0a0340 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.11.x # replace ${camel.docs.branch}
+ - camel-3.12.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.11.x # replace ${camel.sb.docs.branch}
+ - camel-spring-boot-3.12.x # replace ${camel.sb.docs.branch}
start_path: docs
asciidoc:
diff --git a/docs/antora.yml b/docs/antora.yml
index 45c2230..ebff9fe 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -22,7 +22,7 @@ nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
- cq-camel-components: 3.11.x@components # replace
${camel.docs.components.xref}
+ cq-camel-components: 3.12.x@components # replace
${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
quarkus-version: 2.3.0.Final # replace ${quarkus.version}
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
index 6dbebf4..be179d2 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Sending and receive messages to/from AWS SQS service using
AWS SDK version 2.x.
+:cq-description: Send and receive messages to/from AWS SQS service using AWS
SDK version 2.x.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
+Send and receive messages to/from AWS SQS service using AWS SDK version 2.x.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/bean.adoc
b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
index fdfc5f7..eac977b 100644
--- a/docs/modules/ROOT/pages/reference/extensions/bean.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
@@ -20,7 +20,7 @@ Invoke methods of Java beans
== What's inside
* xref:{cq-camel-components}::bean-component.adoc[Bean component], URI syntax:
`bean:beanName`
-* xref:{cq-camel-components}:languages:bean-language.adoc[Bean method language]
+* xref:{cq-camel-components}:languages:bean-language.adoc[Bean Method language]
* xref:{cq-camel-components}::class-component.adoc[Class component], URI
syntax: `class:beanName`
Please refer to the above links for usage and configuration details.
diff --git
a/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
b/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
index b43e3eb..6a26f46 100644
--- a/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Send requests to with an ElasticSearch via REST API.
+:cq-description: Send requests to ElasticSearch via REST API
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Send requests to with an ElasticSearch via REST API.
+Send requests to ElasticSearch via REST API
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
index ff46990..541a809 100644
--- a/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc
@@ -20,7 +20,7 @@ Manage spreadsheets in Google Sheets. Poll for changes in
Google Sheets.
== What's inside
* xref:{cq-camel-components}::google-sheets-component.adoc[Google Sheets
component], URI syntax: `google-sheets:apiName/methodName`
-* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google
Sheets Stream component], URI syntax: `google-sheets-stream:apiName`
+* xref:{cq-camel-components}::google-sheets-stream-component.adoc[Google
Sheets Stream component], URI syntax: `google-sheets-stream:spreadsheetId`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
index f07540d..10f9047 100644
--- a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate a Groovy script.
+:cq-description: Evaluates a Groovy script.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate a Groovy script.
+Evaluates a Groovy script.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
b/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
index 48bd5e5..d366cae 100644
--- a/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/hdfs.adoc
@@ -6,7 +6,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Read and write from/to an HDFS filesystem using Hadoop 2.x.
+:cq-description: Read and write from/to an HDFS filesystem using Hadoop 3.x.
:cq-deprecated: false
:cq-jvm-since: 1.1.0
:cq-native-since: n/a
@@ -14,7 +14,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.1.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
-Read and write from/to an HDFS filesystem using Hadoop 2.x.
+Read and write from/to an HDFS filesystem using Hadoop 3.x.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
b/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
index be42673..98e05f9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/huaweicloud-smn.adoc
@@ -18,7 +18,7 @@ Huawei Cloud component to integrate with SimpleNotification
services
== What's inside
-* xref:{cq-camel-components}::hwcloud-smn-component.adoc[Huawei Cloud Simple
Message Notification (SMN) component], URI syntax: `hwcloud-smn:smnService`
+* xref:{cq-camel-components}::hwcloud-smn-component.adoc[Huawei Simple Message
Notification (SMN) component], URI syntax: `hwcloud-smn:smnService`
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
index c1bf632..c71caf8 100644
--- a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate a JsonPath expression against a JSON message body.
+:cq-description: Evaluates a JSONPath expression against a JSON message body.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,11 +15,11 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Evaluate a JsonPath expression against a JSON message body.
+Evaluates a JSONPath expression against a JSON message body.
== What's inside
-* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JsonPath
language]
+* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JSONPath
language]
Please refer to the above link for usage and configuration details.
diff --git
a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
index a25153a..92c5e6c 100644
--- a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Bridging Eclipse MicroProfile Health with Camel health checks
+:cq-description: Expose Camel health checks via MicroProfile Health
:cq-deprecated: false
:cq-jvm-since: 0.3.0
:cq-native-since: 0.3.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##0.3.0## [.badge-key]##Native
since##[.badge-supported]##0.3.0##
-Bridging Eclipse MicroProfile Health with Camel health checks
+Expose Camel health checks via MicroProfile Health
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/netty.adoc
b/docs/modules/ROOT/pages/reference/extensions/netty.adoc
index 30a781b..3d42861 100644
--- a/docs/modules/ROOT/pages/reference/extensions/netty.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/netty.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Socket level networking using TCP or UDP with the Netty 4.x.
+:cq-description: Socket level networking using TCP or UDP with Netty 4.x.
:cq-deprecated: false
:cq-jvm-since: 0.4.0
:cq-native-since: 0.4.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##0.4.0## [.badge-key]##Native
since##[.badge-supported]##0.4.0##
-Socket level networking using TCP or UDP with the Netty 4.x.
+Socket level networking using TCP or UDP with Netty 4.x.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
index fa12a79..ea19278 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate an Apache Commons Object Graph Navigation Library
(OGNL) expression against the Camel Exchange.
+:cq-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression
against the Camel Exchange.
+Evaluates an OGNL expression (Apache Commons OGNL).
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
index 2ec28b0..0521300 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
@@ -5,14 +5,14 @@
:cq-artifact-id: camel-quarkus-ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
:cq-description: Using Netflix Ribbon for client side load balancing
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.2.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.2.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
[.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
Using Netflix Ribbon for client side load balancing
diff --git a/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
b/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
index abbd9ea..1414dd6 100644
--- a/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Tokenize XML payloads using the specified path expression.
+:cq-description: Tokenize XML payloads.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Tokenize XML payloads using the specified path expression.
+Tokenize XML payloads.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
index 404da3e..bf8011e 100644
--- a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate an XPath expression against an XML payload.
+:cq-description: Evaluates an XPath expression against an XML payload.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Evaluate an XPath expression against an XML payload.
+Evaluates an XPath expression against an XML payload.
== What's inside
diff --git a/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
b/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
index 2a953b3..548e3ad 100644
--- a/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
+++ b/docs/modules/ROOT/partials/reference/components/aws2-sqs.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: aws2-sqs
:cq-camel-part-title: AWS Simple Queue Service (SQS)
-:cq-camel-part-description: Sending and receive messages to/from AWS SQS
service using AWS SDK version 2.x.
+:cq-camel-part-description: Send and receive messages to/from AWS SQS service
using AWS SDK version 2.x.
:cq-extension-page-title: AWS 2 Simple Queue Service (SQS)
diff --git
a/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
b/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
index 3daddf0..5c492ca 100644
--- a/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
+++ b/docs/modules/ROOT/partials/reference/components/elasticsearch-rest.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: elasticsearch-rest
:cq-camel-part-title: Elasticsearch Rest
-:cq-camel-part-description: Send requests to with an ElasticSearch via REST
API.
+:cq-camel-part-description: Send requests to ElasticSearch via REST API
:cq-extension-page-title: Elasticsearch Rest
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git
a/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++
b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
index 06732e9..abc460f 100644
--- a/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-smn.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.8.0
:cq-native-since: n/a
:cq-camel-part-name: hwcloud-smn
-:cq-camel-part-title: Huawei Cloud Simple Message Notification (SMN)
+:cq-camel-part-title: Huawei Simple Message Notification (SMN)
:cq-camel-part-description: To broadcast messages and connect cloud services
through notifications on Huawei Cloud
:cq-extension-page-title: SimpleNotification
diff --git a/docs/modules/ROOT/partials/reference/components/json-patch.adoc
b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/json-patch.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/netty.adoc
b/docs/modules/ROOT/partials/reference/components/netty.adoc
index 559ee24..46dea2e 100644
--- a/docs/modules/ROOT/partials/reference/components/netty.adoc
+++ b/docs/modules/ROOT/partials/reference/components/netty.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.4.0
:cq-camel-part-name: netty
:cq-camel-part-title: Netty
-:cq-camel-part-description: Socket level networking using TCP or UDP with the
Netty 4.x.
+:cq-camel-part-description: Socket level networking using TCP or UDP with
Netty 4.x.
:cq-extension-page-title: Netty
diff --git a/docs/modules/ROOT/partials/reference/languages/bean.adoc
b/docs/modules/ROOT/partials/reference/languages/bean.adoc
index 932cf92..6b11621 100644
--- a/docs/modules/ROOT/partials/reference/languages/bean.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/bean.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 0.1.0
:cq-native-since: 0.1.0
:cq-camel-part-name: bean
-:cq-camel-part-title: Bean method
-:cq-camel-part-description: Call a method of the specified Java bean passing
the Exchange, Body or specific headers to it.
+:cq-camel-part-title: Bean Method
+:cq-camel-part-description: Calls a Java bean method.
:cq-extension-page-title: Bean
diff --git a/docs/modules/ROOT/partials/reference/languages/csimple.adoc
b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
index 877eeba..9d30386 100644
--- a/docs/modules/ROOT/partials/reference/languages/csimple.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.5.0
:cq-camel-part-name: csimple
:cq-camel-part-title: CSimple
-:cq-camel-part-description: Evaluate a compile simple expression language.
+:cq-camel-part-description: Evaluate a compiled simple expression.
:cq-extension-page-title: CSimple
diff --git
a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
index 55b63d2..8c58e71 100644
--- a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: exchangeProperty
:cq-camel-part-title: ExchangeProperty
-:cq-camel-part-description: Get the value of named Camel Exchange property.
+:cq-camel-part-description: Gets a property from the Exchange.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/file.adoc
b/docs/modules/ROOT/partials/reference/languages/file.adoc
index 51b37b3..8cc63c3 100644
--- a/docs/modules/ROOT/partials/reference/languages/file.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/file.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: file
:cq-camel-part-title: File
-:cq-camel-part-description: For expressions and predicates using the
file/simple language.
+:cq-camel-part-description: File related capabilities for the Simple language
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/groovy.adoc
b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
index 84435f8..e86f87b 100644
--- a/docs/modules/ROOT/partials/reference/languages/groovy.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: groovy
:cq-camel-part-title: Groovy
-:cq-camel-part-description: Evaluate a Groovy script.
+:cq-camel-part-description: Evaluates a Groovy script.
:cq-extension-page-title: Groovy
diff --git a/docs/modules/ROOT/partials/reference/languages/header.adoc
b/docs/modules/ROOT/partials/reference/languages/header.adoc
index ba1066e..645fce6 100644
--- a/docs/modules/ROOT/partials/reference/languages/header.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/header.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: header
:cq-camel-part-title: Header
-:cq-camel-part-description: Get the value of the named Camel Message header.
+:cq-camel-part-description: Gets a header from the Exchange.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
index 4d05135..e0a7236 100644
--- a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.8.0
:cq-camel-part-name: hl7terser
:cq-camel-part-title: HL7 Terser
-:cq-camel-part-description: Get the value of an HL7 message field specified by
terse location specification syntax.
+:cq-camel-part-description: Get the value of a HL7 message field specified by
terse location specification syntax.
:cq-extension-page-title: HL7
diff --git a/docs/modules/ROOT/partials/reference/languages/joor.adoc
b/docs/modules/ROOT/partials/reference/languages/joor.adoc
index bb5888c..f382099 100644
--- a/docs/modules/ROOT/partials/reference/languages/joor.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/joor.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: joor
:cq-camel-part-title: jOOR
-:cq-camel-part-description: Evaluate a jOOR (Java compiled once at runtime)
expression language.
+:cq-camel-part-description: Evaluates a jOOR (Java compiled once at runtime)
expression.
:cq-extension-page-title: jOOR
diff --git a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
index ea924fd..1734b0e 100644
--- a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
:cq-camel-part-name: jsonpath
-:cq-camel-part-title: JsonPath
-:cq-camel-part-description: Evaluate a JsonPath expression against a JSON
message body.
+:cq-camel-part-title: JSONPath
+:cq-camel-part-description: Evaluates a JSONPath expression against a JSON
message body.
:cq-extension-page-title: JSON Path
diff --git a/docs/modules/ROOT/partials/reference/languages/mvel.adoc
b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
index 362199e..d247ab1 100644
--- a/docs/modules/ROOT/partials/reference/languages/mvel.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: mvel
:cq-camel-part-title: MVEL
-:cq-camel-part-description: Evaluate an MVEL template against the Camel
Exchange.
+:cq-camel-part-description: Evaluates a MVEL template.
:cq-extension-page-title: MVEL
diff --git a/docs/modules/ROOT/partials/reference/languages/ognl.adoc
b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
index 10da17a..57229a2 100644
--- a/docs/modules/ROOT/partials/reference/languages/ognl.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: ognl
:cq-camel-part-title: OGNL
-:cq-camel-part-description: Evaluate an Apache Commons Object Graph Navigation
Library (OGNL) expression against the Camel Exchange.
+:cq-camel-part-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-extension-page-title: OGNL
diff --git a/docs/modules/ROOT/partials/reference/languages/ref.adoc
b/docs/modules/ROOT/partials/reference/languages/ref.adoc
index d5b5f68..3f5199d 100644
--- a/docs/modules/ROOT/partials/reference/languages/ref.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/ref.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: ref
:cq-camel-part-title: Ref
-:cq-camel-part-description: Look up an expression in the Camel Registry and
evaluate it.
+:cq-camel-part-description: Uses an existing expression from the registry.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/simple.adoc
b/docs/modules/ROOT/partials/reference/languages/simple.adoc
index ab04ad9..2741286 100644
--- a/docs/modules/ROOT/partials/reference/languages/simple.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/simple.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: simple
:cq-camel-part-title: Simple
-:cq-camel-part-description: Evaluate Camel's built-in Simple language
expression against the Camel Exchange.
+:cq-camel-part-description: Evaluates a Camel simple expression.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
b/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
index a3b2751..fe9aa69 100644
--- a/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/tokenize.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: tokenize
:cq-camel-part-title: Tokenize
-:cq-camel-part-description: Tokenize text payloads using the specified
delimiter patterns.
+:cq-camel-part-description: Tokenize text payloads using delimiter patterns.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/xpath.adoc
b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
index 58c3099..cdebabb 100644
--- a/docs/modules/ROOT/partials/reference/languages/xpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: xpath
:cq-camel-part-title: XPath
-:cq-camel-part-description: Evaluate an XPath expression against an XML
payload.
+:cq-camel-part-description: Evaluates an XPath expression against an XML
payload.
:cq-extension-page-title: XPath
diff --git a/docs/modules/ROOT/partials/reference/languages/xquery.adoc
b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
index b609bca..9bc6e85 100644
--- a/docs/modules/ROOT/partials/reference/languages/xquery.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 2.0.0
:cq-camel-part-name: xquery
:cq-camel-part-title: XQuery
-:cq-camel-part-description: Evaluate an XQuery expressions against an XML
payload.
+:cq-camel-part-description: Evaluates an XQuery expressions against an XML
payload.
:cq-extension-page-title: XQuery
diff --git a/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
b/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
index 61bd841..a17a493 100644
--- a/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: xtokenize
:cq-camel-part-title: XML Tokenize
-:cq-camel-part-description: Tokenize XML payloads using the specified path
expression.
+:cq-camel-part-description: Tokenize XML payloads.
:cq-extension-page-title: XML JAXP
diff --git
a/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
b/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
index 89dc0a6..ed35e3c 100644
--- a/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
+++ b/docs/modules/ROOT/partials/reference/others/microprofile-health.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.3.0
:cq-camel-part-name: microprofile-health
:cq-camel-part-title: Microprofile Health
-:cq-camel-part-description: Bridging Eclipse MicroProfile Health with Camel
health checks
+:cq-camel-part-description: Expose Camel health checks via MicroProfile Health
:cq-extension-page-title: MicroProfile Health
diff --git a/docs/modules/ROOT/partials/reference/others/ribbon.adoc
b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
index af55164..1e77b26 100644
--- a/docs/modules/ROOT/partials/reference/others/ribbon.adoc
+++ b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
@@ -4,7 +4,7 @@
:cq-artifact-id-base: ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
:cq-camel-part-name: ribbon
diff --git a/extensions-jvm/hdfs/runtime/pom.xml
b/extensions-jvm/hdfs/runtime/pom.xml
index 3813f3f..3781f1e 100644
--- a/extensions-jvm/hdfs/runtime/pom.xml
+++ b/extensions-jvm/hdfs/runtime/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-quarkus-hdfs</artifactId>
<name>Camel Quarkus :: HDFS :: Runtime</name>
- <description>Read and write from/to an HDFS filesystem using Hadoop
2.x.</description>
+ <description>Read and write from/to an HDFS filesystem using Hadoop
3.x.</description>
<properties>
<camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
diff --git a/extensions-jvm/spark/bom/pom.xml b/extensions-jvm/spark/bom/pom.xml
index 0923bbc..3675431 100644
--- a/extensions-jvm/spark/bom/pom.xml
+++ b/extensions-jvm/spark/bom/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-quarkus-spark-bom</artifactId>
<packaging>pom</packaging>
<name>Camel Quarkus :: Spark :: BOM</name>
- <description>Camel Quarkus Spark specific dependency
managament</description>
+ <description>Camel Quarkus Spark specific dependency
management</description>
<dependencyManagement>
<dependencies>
@@ -73,6 +73,11 @@
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>${guice-servlet.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-sun.version}</version><!-- Replace
com.sun.jersey:jersey-core:1.9 that contains old and incompatible javax.ws.rs.*
classes -->
@@ -98,11 +103,36 @@
<version>${jersey-sun.version}</version><!-- Replace
com.sun.jersey:jersey-core:1.9 that contains old and incompatible javax.ws.rs.*
classes -->
</dependency>
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey-sun.version}</version> <!-- Spark -->
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty3.version}</version><!-- Managed here because
it would conflict with netty 4 used elsewhere -->
</dependency>
<dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-json</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jvm</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version><!-- Managed here because
it is not used elsewhere -->
@@ -110,37 +140,42 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop2.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
+ <version>${hadoop3.version}</version><!-- Managed here because
it would conflict with Hadoop 3 used elsewhere -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${libthrift-version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>${scala-2.11.version}</version>
+ <version>${scala-2.12.version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
diff --git
a/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
b/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
index 747dae2..c01f2f8 100644
---
a/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
+++
b/extensions/jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/jaxb/deployment/JaxbProcessor.java
@@ -21,9 +21,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import org.apache.camel.converter.jaxb.mapper.SunJaxb21NamespacePrefixMapper;
import org.apache.camel.quarkus.component.jaxb.JaxbRecorder;
import
org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
@@ -42,11 +40,6 @@ class JaxbProcessor {
}
@BuildStep
- ReflectiveClassBuildItem mapper() {
- return new ReflectiveClassBuildItem(false, false,
SunJaxb21NamespacePrefixMapper.class);
- }
-
- @BuildStep
@Record(value = ExecutionTime.STATIC_INIT)
CamelContextCustomizerBuildItem contextCustomizer(JaxbRecorder recorder) {
return new
CamelContextCustomizerBuildItem(recorder.newRestBindingJaxbDataFormatFactoryContextCustomizer());
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
index 27d890b..7a113e3 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
@@ -23,7 +23,6 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -39,10 +38,6 @@ public class Aws2DdbStreamResource {
CamelContext camelContext;
@Inject
- @Named("aws2DdbStreamSequenceNumberProvider")
- TestSequenceNumberProvider sequenceNumberProvider;
-
- @Inject
@Named("aws2DdbStreamReceivedEvents")
List<Map<String, String>> aws2DdbStreamReceivedEvents;
@@ -59,12 +54,6 @@ public class Aws2DdbStreamResource {
aws2DdbStreamReceivedEvents.clear();
}
- @Path("/setSequenceNumber")
- @POST
- public void setSequenceNumber(String newSn) {
- sequenceNumberProvider.setLastSequenceNumber(newSn);
- }
-
@GET
@Path("/route/{routeId}/{operation}")
@Produces(MediaType.TEXT_PLAIN)
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
index b7671d8..8d73b81 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
@@ -44,7 +44,7 @@ public class Aws2DdbStreamRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
from("aws2-ddbstream://" + streamTableName
- +
"?sequenceNumberProvider=#aws2DdbStreamSequenceNumberProvider&iteratorType=AT_SEQUENCE_NUMBER")
+ + "?streamIteratorType=FROM_LATEST")
.id("aws2DdbStreamRoute")
.process(e -> {
Record record =
e.getMessage().getBody(Record.class);
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
deleted file mode 100644
index e276715..0000000
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-
-import org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider;
-
-@ApplicationScoped
-@Named("aws2DdbStreamSequenceNumberProvider")
-public class TestSequenceNumberProvider implements SequenceNumberProvider {
-
- private String lastSn = "0";
-
- @Override
- public String getSequenceNumber() {
- return lastSn;
- }
-
- public void setLastSequenceNumber(String newSn) {
- lastSn = newSn;
- }
-}
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
index de0b7ab..26b3f29 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
@@ -116,8 +116,6 @@ class Aws2DdbStreamTest {
&& put2SeqNumber.length() > 0);
- /* SequenceNumber */
-
RestAssured.given()
.get("/aws2-ddbstream/clear")
.then()
@@ -127,12 +125,6 @@ class Aws2DdbStreamTest {
routeController("stop", null);
routeController("status", ServiceStatus.Stopped.name());
- RestAssured.given()
- .body(put2SeqNumber.toString())
- .post("/aws2-ddbstream/setSequenceNumber")
- .then()
- .statusCode(204);
-
routeController("start", null);
routeController("status", ServiceStatus.Started.name());
waitForStreamConsumerToStart();
@@ -153,7 +145,7 @@ class Aws2DdbStreamTest {
.then()
.statusCode(204);
- /* There should be only key2 and key3, because route is started with
parameter "AT_SEQUENCE_NUMBER" of put #2. */
+ /* There should be put & update events for key 3 */
Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(120,
TimeUnit.SECONDS).until(
() -> {
ExtractableResponse<Response> result =
RestAssured.get("/aws2-ddbstream/change")
@@ -167,20 +159,16 @@ class Aws2DdbStreamTest {
retVal = retVal.stream().filter(m ->
!String.valueOf(m.get("key")).startsWith("initKey"))
.collect(Collectors.toList());
- LOG.info("Expecting 3 events, got " + result.statusCode()
+ ": " + retVal);
+ LOG.info("Expecting 2 events, got " + result.statusCode()
+ ": " + retVal);
return retVal;
},
- list -> list.size() == 3
-
- && key2.equals(list.get(0).get("key"))
- && msg2.equals(list.get(0).get("new"))
+ list -> list.size() == 2
+ && key3.equals(list.get(0).get("key"))
+ && msg3.equals(list.get(0).get("new"))
&& key3.equals(list.get(1).get("key"))
- && msg3.equals(list.get(1).get("new"))
-
- && key3.equals(list.get(2).get("key"))
- && msg3.equals(list.get(2).get("old")));
+ && msg3.equals(list.get(1).get("old")));
}
private void waitForStreamConsumerToStart() {
diff --git a/integration-tests-jvm/spark/pom.xml
b/integration-tests-jvm/spark/pom.xml
index 72606d2..2e9d753 100644
--- a/integration-tests-jvm/spark/pom.xml
+++ b/integration-tests-jvm/spark/pom.xml
@@ -93,7 +93,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>--add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
+ <argLine>--add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
diff --git
a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
index e8d2d9e..b7f5fb2 100644
---
a/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
+++
b/integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java
@@ -44,7 +44,7 @@ public class As2Sender {
As2Helper.AS2_NAME,
As2Helper.AS2_NAME, AS2MessageStructure.PLAIN,
ContentType.create(AS2MediaType.APPLICATION_EDIFACT,
AS2Charset.US_ASCII), null, null, null, null,
- null, As2Helper.DISPOSITION_NOTIFICATION_TO,
As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null);
+ null, As2Helper.DISPOSITION_NOTIFICATION_TO,
As2Helper.SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
}
public interface As2SenderClient {
diff --git
a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
index edcb2f3..e9cd7ab 100644
---
a/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
+++
b/integration-tests/dataformats-json/src/main/resources/routes/gson-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Gson-type-as-attribute"/>
<unmarshal>
- <json library="Gson"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Gson"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
diff --git
a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
index bfee9c4..d0a240a 100644
---
a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
+++
b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Jackson-type-as-attribute"/>
<unmarshal>
- <json library="Jackson"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Jackson"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
@@ -42,14 +42,14 @@
<route>
<from uri="direct:jacksonxml-unmarshal-spring-list-backPojo"/>
- <unmarshal><jacksonxml useList="true"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><jacksonxml useList="true"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jacksonxml-unmarshal-spring-list-reversePojo"/>
</route>
<route>
<from uri="direct:jacksonxml-marshal-spring-enablefeature"/>
<marshal>
- <jacksonxml
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
+ <jacksonxml
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
enableFeatures="WRAP_ROOT_VALUE"/>
</marshal>
</route>
@@ -72,35 +72,35 @@
<route>
<from uri="direct:jacksonxml-xml-inPojo"/>
- <marshal><jacksonxml
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal>
+ <marshal><jacksonxml
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal>
</route>
<route>
<from uri="direct:jacksonxml-xml-backPojo"/>
- <unmarshal><jacksonxml
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><jacksonxml
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jacksonxml-xml-reversePojo"/>
</route>
<route>
<from uri="direct:jacksonxml-xml-inAgeView"/>
- <marshal><jacksonxml
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView"
jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal>
+ <marshal><jacksonxml
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView"
jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal>
</route>
<route>
<from uri="direct:jacksonxml-xml-backAgeView"/>
- <unmarshal><jacksonxml
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView"
jsonViewTypeName="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal>
+ <unmarshal><jacksonxml
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView"
jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal>
<to uri="mock:jacksonxml-xml-reverseAgeView"/>
</route>
<route>
<from uri="direct:jackson-xml-unmarshal-list-backPojo"/>
- <unmarshal><json library="Jackson" useList="true"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
+ <unmarshal><json library="Jackson" useList="true"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal>
<to uri="mock:jackson-xml-unmarshal-list-reversePojo"/>
</route>
<route>
<from uri="direct:jackson-enablefeature-in"/>
- <marshal><json library="Jackson"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
+ <marshal><json library="Jackson"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"
enableFeatures="WRAP_ROOT_VALUE"/></marshal>
</route>
</routes>
diff --git
a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
index 539ff1f..191ff7d 100644
---
a/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
+++
b/integration-tests/dataformats-json/src/main/resources/routes/johnzon-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Johnzon-type-as-attribute"/>
<unmarshal>
- <json library="Johnzon"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Johnzon"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
diff --git
a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
index 261e88f..c48b9b6 100644
---
a/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
+++
b/integration-tests/dataformats-json/src/main/resources/routes/jsonb-routes.xml
@@ -26,7 +26,7 @@
<route>
<from uri="direct:Jsonb-type-as-attribute"/>
<unmarshal>
- <json library="Jsonb"
unmarshalTypeName="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
+ <json library="Jsonb"
unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.AnotherObject"/>
</unmarshal>
</route>
diff --git
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
index 6e55116..8646edc 100644
---
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
+++
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubsubTestResource.java
@@ -61,6 +61,7 @@ public class GooglePubsubTestResource implements
QuarkusTestResourceLifecycleMan
"project.id", PROJECT_ID,
"topic.name", TOPIC,
"subscription.name", SUBSCRIPTION,
+ "camel.component.google-pubsub.authenticate", "false",
"camel.component.google-pubsub.endpoint",
container.getEmulatorEndpoint());
} catch (Exception e) {
throw new RuntimeException(e);
diff --git
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
index d4785ca..479b2c5 100644
---
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
+++
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
@@ -24,12 +24,8 @@ import javax.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter;
import
org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
-import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
@@ -39,7 +35,6 @@ import
org.apache.camel.component.salesforce.api.dto.SObjectField;
* Salesforce DTO for SObject Account
*/
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-@XStreamAlias("Account")
public class Account extends AbstractDescribedSObjectBase {
public Account() {
@@ -60,7 +55,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecordId = MasterRecordId;
}
- @XStreamAlias("MasterRecord")
private Account MasterRecord;
@JsonProperty("MasterRecord")
@@ -73,7 +67,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecord = MasterRecord;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_TypeEnum Type;
@JsonProperty("Type")
@@ -98,7 +91,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ParentId = ParentId;
}
- @XStreamAlias("Parent")
private Account Parent;
@JsonProperty("Parent")
@@ -195,7 +187,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.BillingLongitude = BillingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_BillingGeocodeAccuracyEnum BillingGeocodeAccuracy;
@JsonProperty("BillingGeocodeAccuracy")
@@ -304,7 +295,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ShippingLongitude = ShippingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ShippingGeocodeAccuracyEnum ShippingGeocodeAccuracy;
@JsonProperty("ShippingGeocodeAccuracy")
@@ -401,7 +391,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Sic = Sic;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_IndustryEnum Industry;
@JsonProperty("Industry")
@@ -438,7 +427,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberOfEmployees = NumberOfEmployees;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_OwnershipEnum Ownership;
@JsonProperty("Ownership")
@@ -475,7 +463,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Description = Description;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_RatingEnum Rating;
@JsonProperty("Rating")
@@ -524,7 +511,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.JigsawCompanyId = JigsawCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CleanStatusEnum CleanStatus;
@JsonProperty("CleanStatus")
@@ -537,7 +523,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CleanStatus = CleanStatus;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_AccountSourceEnum AccountSource;
@JsonProperty("AccountSource")
@@ -634,7 +619,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.DandbCompanyId = DandbCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CustomerPriorityEnum CustomerPriority__c;
@JsonProperty("CustomerPriority__c")
@@ -647,7 +631,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CustomerPriority__c = CustomerPriority__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_SLAEnum SLA__c;
@JsonProperty("SLA__c")
@@ -660,7 +643,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLA__c = SLA__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ActiveEnum Active__c;
@JsonProperty("Active__c")
@@ -685,7 +667,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberofLocations__c = NumberofLocations__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_UpsellOpportunityEnum UpsellOpportunity__c;
@JsonProperty("UpsellOpportunity__c")
@@ -722,7 +703,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLAExpirationDate__c = SLAExpirationDate__c;
}
- @XStreamConverter(MultiSelectPicklistConverter.class)
private Account_MyMultiselectEnum[] MyMultiselect__c;
@JsonProperty("MyMultiselect__c")
diff --git
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
index 78cab0f..569227e 100644
---
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
+++
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
@@ -20,7 +20,6 @@ import java.util.List;
import javax.annotation.Generated;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
/**
@@ -29,7 +28,6 @@ import
org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
public class QueryRecordsAccount extends AbstractQueryRecordsBase {
- @XStreamImplicit
private List<Account> records;
public List<Account> getRecords() {
diff --git a/pom.xml b/pom.xml
index 6127d6a..8932c36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.2</version>
+ <version>3.12.0</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,8 +39,8 @@
<properties>
<!-- Primary dependencies - maintained manually -->
- <camel.major.minor>3.11</camel.major.minor> <!-- run after each
change: cd docs && mvnd validate -->
- <camel.version>${camel.major.minor}.2</camel.version>
+ <camel.major.minor>3.12</camel.major.minor> <!-- run after each
change: cd docs && mvnd validate -->
+ <camel.version>${camel.major.minor}.0</camel.version>
<camel.docs.components.xref>${camel.major.minor}.x@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 -->
<camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!--
The stable camel-spring-boot branch on which our Antora docs depends -->
@@ -69,6 +69,8 @@
<commons-collections.version>3.2.2</commons-collections.version><!--
used by hbase, should be pretty stable as commons-collections are not developed
actively anymore -->
<commons-lang.version>2.6</commons-lang.version><!-- used by hbase,
should be pretty stable as commons-lang is not developed actively anymore -->
<commons-math3.version>3.6.1</commons-math3.version><!-- Mess in the
transitive dependencies of Spark and hbase-testing-util -->
+ <commons-net.version>${commons-net-version}</commons-net.version> <!--
Spark -->
+ <commons-text.version>${commons-text-version}</commons-text.version>
<!-- Spark -->
<curator.version>4.3.0</curator.version><!-- Mess in the transitive
dependencies of Spark, Zookeeper and other hadoop related components -->
<derby.version>10.15.2.0</derby.version><!-- Spark -->
<eddsa.version>${eddsa-version}</eddsa.version>
@@ -80,7 +82,8 @@
<graalvm.version>21.2.0</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
<grpc.version>1.40.1</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<gson.version>2.8.6</gson.version><!-- @sync
com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version}
dep:com.google.code.gson:gson -->
- <hadoop2.version>${hadoop2-version}</hadoop2.version><!-- Spark -->
+ <guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
+ <hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hbase.version>${hbase-version}</hbase.version>
@@ -101,8 +104,10 @@
<kafka.version>2.8.1</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.5.30</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark
-->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
- <minio.version>${minio-version}</minio.version><!-- Keep in sync with
quarkiverse-minio and Camel, preferring Camel assuming that it is more likely
to be up to date -->
+ <metrics.version>${metrics-version}</metrics.version><!-- Spark -->
+ <minio.version>8.2.2</minio.version><!-- Keep in sync with
quarkiverse-minio and Camel, preferring Camel assuming that it is more likely
to be up to date. Keep quarkiverse version, until the okhttp dependeny version
inherited from quarkus-bom is resolved as described here
https://github.com/quarkiverse/quarkus-minio/pull/72 -->
<mvel2.version>${mvel-version}</mvel2.version>
<nimbus-jose-jwt.version>9.10</nimbus-jose-jwt.version><!-- Mess in
hdfs transitive deps, used also by io.strimzi:kafka-oauth-client recommended by
https://quarkus.io/guides/kafka#authenticating-with-oauth -->
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
@@ -110,7 +115,7 @@
<protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
- <scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
+ <scala-2.12.version>2.12.14</scala-2.12.version><!-- Spark -->
<smallrye.reactive.messaging.camel.version>3.9.1</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
