You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/09/14 04:13:11 UTC
[camel-quarkus] branch camel-main updated (bd34672 -> 17f010c)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard bd34672 Adapt to latest Camel API changes
discard 5af26c3 Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
discard 47db426 Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
discard 7f3fc41 Camel 3.12 : Dataformat fix attributes names
discard 21045f6 Upgrade spark and hadoop versions
discard e01f025 Upgrade Camel to 3.12.0
add d6138e2 Fixup 9788fb65 Remove leftover extensions-jvm/digitalocean
add 0be98ea Use test grouping for MongoDB extensions
add af91682 Add notes on how to configure the Platform HTTP server
new 6db20e9 Upgrade Camel to 3.12.0
new 824ca9a Upgrade spark and hadoop versions
new 0012193 Camel 3.12 : Dataformat fix attributes names
new a470c6c Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
new 0f33d38 Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
new 17f010c Adapt to latest Camel API changes
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 (bd34672)
\
N -- N -- N refs/heads/camel-main (17f010c)
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 6 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:
.../pages/reference/extensions/platform-http.adoc | 16 ++-
.../digitalocean/integration-test/pom.xml | 83 -------------
.../runtime/src/main/doc/configuration.adoc | 14 ++-
.../platform-http/runtime/src/main/doc/usage.adoc | 2 +-
.../mongodb-gridfs}/pom.xml | 24 ++--
.../mongodb/gridfs}/it/MongodbGridfsResource.java | 2 +-
.../mongodb/gridfs}/it/MongodbGridfsIT.java | 2 +-
.../mongodb/gridfs}/it/MongodbGridfsTest.java | 3 +-
.../type-converter => mongodb/mongodb}/pom.xml | 24 ++--
.../component/mongodb/it/MongoDbResource.java | 3 -
.../quarkus/component/mongodb/it/MongoDbRoute.java | 34 +++---
.../quarkus/component/mongodb/it/MongoDbIT.java | 0
.../quarkus/component/mongodb/it/MongoDbTest.java | 52 ++++----
integration-test-groups/{azure => mongodb}/pom.xml | 9 +-
.../{azure => mongodb}/pom.xml | 8 +-
.../test/support/mongodb/MongoDbConstants.java | 17 +--
.../test/support/mongodb}/MongoDbTestResource.java | 28 +++--
.../src/main}/resources/application.properties | 2 +-
.../mongodb/src/main}/resources/initMongodb.txt | 0
integration-tests-support/pom.xml | 1 +
.../{azure-grouped => mongodb-grouped}/pom.xml | 58 ++-------
integration-tests/mongodb/pom.xml | 132 ---------------------
integration-tests/pom.xml | 2 +-
poms/bom-test/pom.xml | 5 +
tooling/scripts/test-categories.yaml | 2 +-
25 files changed, 152 insertions(+), 371 deletions(-)
delete mode 100644 extensions-jvm/digitalocean/integration-test/pom.xml
copy integration-test-groups/{foundation/type-converter => mongodb/mongodb-gridfs}/pom.xml (88%)
rename {integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb => integration-test-groups/mongodb/mongodb-gridfs/src/main/java/org/apache/camel/quarkus/component/mongodb/gridfs}/it/MongodbGridfsResource.java (98%)
rename {integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb => integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs}/it/MongodbGridfsIT.java (93%)
rename {integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb => integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs}/it/MongodbGridfsTest.java (95%)
copy integration-test-groups/{foundation/type-converter => mongodb/mongodb}/pom.xml (88%)
rename {integration-tests => integration-test-groups/mongodb}/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java (98%)
rename {integration-tests => integration-test-groups/mongodb}/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java (68%)
rename {integration-tests => integration-test-groups/mongodb}/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java (100%)
rename {integration-tests => integration-test-groups/mongodb}/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java (81%)
copy integration-test-groups/{azure => mongodb}/pom.xml (86%)
copy integration-tests-support/{azure => mongodb}/pom.xml (87%)
copy extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteConstants.java => integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb/MongoDbConstants.java (59%)
rename {integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it => integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb}/MongoDbTestResource.java (81%)
copy {extensions/kafka/deployment/src/test => integration-tests-support/mongodb/src/main}/resources/application.properties (95%)
rename {integration-tests/mongodb/src/test => integration-tests-support/mongodb/src/main}/resources/initMongodb.txt (100%)
copy integration-tests/{azure-grouped => mongodb-grouped}/pom.xml (79%)
delete mode 100644 integration-tests/mongodb/pom.xml
[camel-quarkus] 03/06: Camel 3.12 : Dataformat fix attributes names
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 001219303bd471c866479f3d9a62d3b0b7ac9b5b
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Tue Jul 6 17:35:09 2021 +0200
Camel 3.12 : Dataformat fix attributes names
---
.../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 +-
4 files changed, 12 insertions(+), 12 deletions(-)
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>
[camel-quarkus] 05/06: Remove redundant reflective class
registration for SunJaxb21NamespacePrefixMapper
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0f33d382270cedc0c86d98b5cd730b0bd6a262c6
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 2 07:57:34 2021 +0100
Remove redundant reflective class registration for SunJaxb21NamespacePrefixMapper
---
.../camel/quarkus/component/jaxb/deployment/JaxbProcessor.java | 7 -------
1 file changed, 7 deletions(-)
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());
[camel-quarkus] 06/06: Adapt to latest Camel API changes
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 17f010cb3506bb37462741166e087b7f932a62bb
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Sep 2 08:53:34 2021 +0100
Adapt to latest Camel API changes
---
docs/modules/ROOT/pages/reference/extensions/google-sheets.adoc | 2 +-
docs/modules/ROOT/partials/reference/components/json-patch.adoc | 1 +
extensions-jvm/spark/integration-test/pom.xml | 2 +-
.../test/java/org/apache/camel/quarkus/component/as2/it/As2Sender.java | 2 +-
.../quarkus/component/google/pubsub/it/GooglePubsubTestResource.java | 1 +
5 files changed, 5 insertions(+), 3 deletions(-)
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/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/extensions-jvm/spark/integration-test/pom.xml b/extensions-jvm/spark/integration-test/pom.xml
index a6056d2..73df3c9 100644
--- a/extensions-jvm/spark/integration-test/pom.xml
+++ b/extensions-jvm/spark/integration-test/pom.xml
@@ -100,7 +100,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/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);
[camel-quarkus] 04/06: Sync minio version with quarkiverse version
due to incompatible okhttp version between quarkus and recent minio version
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a470c6cdb67727e05b364144c3b296f4d5abeba8
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Aug 4 17:10:58 2021 +0200
Sync minio version with quarkiverse version due to incompatible okhttp version between quarkus and recent minio version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4a704a2..45b7b22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<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 -->
+ <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>
[camel-quarkus] 01/06: Upgrade Camel to 3.12.0
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6db20e9a06f90020bf13cc20b5d3ce6e9a507bfa
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 4b37174..166f265 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.2.1.Final # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index 42bfd29..29dc9c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.11.1</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}.1</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/06: Upgrade spark and hadoop versions
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 824ca9a926e69d94fc8ab0d605bbf153c364a47c
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 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/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 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/pom.xml b/pom.xml
index 29dc9c8..4a704a2 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>
@@ -78,7 +80,8 @@
<graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
<grpc.version>1.38.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>
@@ -99,7 +102,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.5.21</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><!-- Mess in hdfs transitive deps, used also by io.strimzi:kafka-oauth-client recommended by https://quarkus.io/guides/kafka#authenticating-with-oauth -->
@@ -108,7 +113,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>