You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zb...@apache.org on 2021/07/06 13:30:21 UTC
[camel-quarkus] branch camel-main updated (967453f -> ff9aa5e)
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 967453f Upgrade Camel to 3.12.0
add 22e72ec Add test for camel.faulttolerance.* properties #2780
add 7729b52 Updated CHANGELOG.md
add ad6f720 kafka : impossible to authenticate with oauth2 (#2879)
new 22d8a46 Upgrade Camel to 3.12.0
new ff9aa5e Upgrade spark and hadoop versions
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (967453f)
\
N -- N -- N refs/heads/camel-main (ff9aa5e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 5 ++
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 4 +-
.../reference/extensions/elasticsearch-rest.adoc | 4 +-
.../ROOT/pages/reference/extensions/hdfs.adoc | 4 +-
.../reference/extensions/huaweicloud-smn.adoc | 2 +-
.../reference/extensions/microprofile-health.adoc | 4 +-
.../ROOT/pages/reference/extensions/netty.adoc | 4 +-
.../partials/reference/components/aws2-sqs.adoc | 2 +-
.../reference/components/elasticsearch-rest.adoc | 2 +-
.../partials/reference/components/hwcloud-smn.adoc | 2 +-
.../ROOT/partials/reference/components/netty.adoc | 2 +-
.../reference/languages/exchangeProperty.adoc | 2 +-
.../ROOT/partials/reference/languages/file.adoc | 2 +-
.../ROOT/partials/reference/languages/header.adoc | 2 +-
.../partials/reference/languages/tokenize.adoc | 2 +-
.../reference/others/microprofile-health.adoc | 2 +-
extensions-jvm/hdfs/runtime/pom.xml | 2 +-
extensions-jvm/spark/bom/pom.xml | 51 +++++++++++++---
.../pom.xml | 21 +++----
.../quarkus/core/CoreFaultToleranceProducers.java | 57 +++++++++++++++++
.../quarkus/core/CoreFaultToleranceResource.java | 71 ++++++++++++++++++++++
.../quarkus/core/CoreFaultToleranceRoutes.java | 17 ++++--
.../src/main/resources/application.properties | 18 ++++--
.../camel/quarkus/core/CoreFaultToleranceIT.java} | 5 +-
.../quarkus/core/CoreFaultToleranceTest.java} | 25 +++++---
integration-test-groups/foundation/pom.xml | 1 +
integration-tests/foundation-grouped/pom.xml | 17 ++++++
pom.xml | 11 +++-
28 files changed, 275 insertions(+), 66 deletions(-)
copy integration-test-groups/foundation/{core-annotations => core-fault-tolerance}/pom.xml (89%)
create mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/CoreFaultToleranceProducers.java
create mode 100644 integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/CoreFaultToleranceResource.java
copy integration-tests/core-discovery-disabled/src/main/java/org/apache/camel/quarkus/core/CoreDiscoveryDisabledRoutesCDI.java => integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/CoreFaultToleranceRoutes.java (63%)
copy {integration-tests/dataformats-json => integration-test-groups/foundation/core-fault-tolerance}/src/main/resources/application.properties (62%)
copy integration-test-groups/foundation/{core-languages/src/test/java/org/apache/camel/quarkus/core/languages/it/SimpleIT.java => core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/CoreFaultToleranceIT.java} (94%)
copy integration-test-groups/foundation/{core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java => core-fault-tolerance/src/test/java/org/apache/camel/quarkus/core/CoreFaultToleranceTest.java} (54%)
[camel-quarkus] 01/02: Upgrade Camel to 3.12.0
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 22d8a46cea5abe43cffc049f7bdc6f81d1c733b5
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 29 11:56:56 2021 +0100
Upgrade Camel to 3.12.0
---
docs/antora-playbook-dev.yml | 2 +-
docs/antora-playbook.yml | 2 +-
docs/antora.yml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 6 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: git@github.com: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: git@github.com:apache/camel.git
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 0450197..072b485 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -26,7 +26,7 @@ content:
start_path: docs
- url: git@github.com: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: git@github.com:apache/camel.git
diff --git a/docs/antora.yml b/docs/antora.yml
index 6bbc81f..f214359 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -22,6 +22,6 @@ 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}
quarkus-version: 2.0.0.Final # replace ${quarkus.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5905ab4..8fb74b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -38,8 +38,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}.0</camel.version>
+ <camel.major.minor>3.12</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
+ <camel.version>${camel.major.minor}.0-SNAPSHOT</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 branch on which our Antora docs depends -->
[camel-quarkus] 02/02: Upgrade spark and hadoop versions
Posted by zb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ff9aa5ee212bdff54250a75cb4a63fe576b8903d
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Tue Jul 6 14:30:31 2021 +0200
Upgrade spark and hadoop versions
---
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 4 +-
.../reference/extensions/elasticsearch-rest.adoc | 4 +-
.../ROOT/pages/reference/extensions/hdfs.adoc | 4 +-
.../reference/extensions/huaweicloud-smn.adoc | 2 +-
.../reference/extensions/microprofile-health.adoc | 4 +-
.../ROOT/pages/reference/extensions/netty.adoc | 4 +-
.../partials/reference/components/aws2-sqs.adoc | 2 +-
.../reference/components/elasticsearch-rest.adoc | 2 +-
.../partials/reference/components/hwcloud-smn.adoc | 2 +-
.../ROOT/partials/reference/components/netty.adoc | 2 +-
.../reference/languages/exchangeProperty.adoc | 2 +-
.../ROOT/partials/reference/languages/file.adoc | 2 +-
.../ROOT/partials/reference/languages/header.adoc | 2 +-
.../partials/reference/languages/tokenize.adoc | 2 +-
.../reference/others/microprofile-health.adoc | 2 +-
extensions-jvm/hdfs/runtime/pom.xml | 2 +-
extensions-jvm/spark/bom/pom.xml | 51 ++++++++++++++++++----
pom.xml | 9 +++-
18 files changed, 71 insertions(+), 31 deletions(-)
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/elasticsearch-rest.adoc b/docs/modules/ROOT/pages/reference/extensions/elasticsearch-rest.adoc
index 854aa27..faa258a 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/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/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/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-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/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/exchangeProperty.adoc b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
index 55b63d2..9533c59 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: Get values of named Camel Exchange properties.
: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..4f56872 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 Simle language
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/header.adoc b/docs/modules/ROOT/partials/reference/languages/header.adoc
index ba1066e..5611593 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: Get values of Camel Message headers.
: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/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/extensions-jvm/hdfs/runtime/pom.xml b/extensions-jvm/hdfs/runtime/pom.xml
index 498ec47..d204919 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 32a237e..9e6540a 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/pom.xml b/pom.xml
index 8fb74b7..25aca9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,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>
@@ -77,7 +79,8 @@
<guava.version>29.0-jre</guava.version>
<graalvm.version>21.1.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
<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>
@@ -98,7 +101,9 @@
<kafka.version>2.8.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.4.32</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 -->
+ <metrics.version>${metrics-version}</metrics.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 -->
<mvel2.version>${mvel-version}</mvel2.version>
<nimbus-jose-jwt.version>9.10</nimbus-jose-jwt.version><!-- It's placed here because of mess in hdfs transitive deps, please upgrade when it's possible -->
@@ -107,7 +112,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.5.0</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>