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 dcd5bde69c Remove amazon-kinesis-client dependency override
dcd5bde69c is described below
commit dcd5bde69c34aa854e6af20996265894d8668595
Author: James Netherton <[email protected]>
AuthorDate: Tue May 19 07:07:00 2026 +0100
Remove amazon-kinesis-client dependency override
Fixes #7812
Now that Camel 4.20 uses amazon-kinesis-client 3.4.2 (which is
compatible with protobuf-java 4.x), the dependency overrides added
as a workaround for Quarkus 3.29's protobuf 4.x upgrade are no
longer needed.
Removed:
- amazon-kinesis-client.version property (3.1.3)
- re2j.version property (1.7)
- rxjava3.version property (3.1.8)
- Dependency management entries in poms/bom/pom.xml
- Explicit amazon-kinesis-client dependency from aws2-kinesis extension
These properties and dependency management entries were added in
August 2024 to avoid convergence issues and are now redundant.
Co-authored-by: Claude Sonnet 4.5 <[email protected]>
---
extensions/aws2-kinesis/runtime/pom.xml | 5 ---
pom.xml | 5 +--
poms/bom/pom.xml | 50 ----------------------
poms/bom/src/main/generated/flattened-full-pom.xml | 49 ---------------------
.../src/main/generated/flattened-reduced-pom.xml | 49 ---------------------
.../generated/flattened-reduced-verbose-pom.xml | 49 ---------------------
6 files changed, 1 insertion(+), 206 deletions(-)
diff --git a/extensions/aws2-kinesis/runtime/pom.xml
b/extensions/aws2-kinesis/runtime/pom.xml
index 1c31cb463a..c07befc511 100644
--- a/extensions/aws2-kinesis/runtime/pom.xml
+++ b/extensions/aws2-kinesis/runtime/pom.xml
@@ -37,11 +37,6 @@
</properties>
<dependencies>
- <!-- TODO: Remove this
https://github.com/apache/camel-quarkus/issues/7812 -->
- <dependency>
- <groupId>software.amazon.kinesis</groupId>
- <artifactId>amazon-kinesis-client</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
diff --git a/pom.xml b/pom.xml
index be294a4d86..ba9d2fb1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,6 @@
<!-- Compile dependency versions (keep sorted alphabetically) -->
<!-- Items annotated with @sync can be updated by running mvn
cq:sync-versions -N -e -->
<aalto-xml.version>1.3.3</aalto-xml.version><!-- @sync
org.smooks:smooks-core:${smooks.version} dep:com.fasterxml:aalto-xml -->
-
<amazon-kinesis-client.version>3.1.3</amazon-kinesis-client.version><!-- TODO:
remove this https://github.com/apache/camel-quarkus/issues/7812 -->
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and
probably others -->
<audience-annotations.version>${yetus-audience-annotations-version}</audience-annotations.version>
<avro.version>1.12.1</avro.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
@@ -160,13 +159,11 @@
<okio.version>3.16.1</okio.version><!-- @sync
com.squareup.okhttp3:okhttp-jvm:${okhttp-jvm.version}
dep:com.squareup.okio:okio-jvm-->
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google
cloud. Keep in sync with version used in
com.google.http-client:google-http-client -->
<opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!--
Alignment for camel-opentelemetry and google-pubsub -->
- <org.json.version>20240303</org.json.version><!-- Used by
amazon-kinesis-client, google-cloud-bigquery and com.ibm.mq.jakarta.client -->
- <re2j.version>1.7</re2j.version><!-- Used by google-cloud-pubsub and
amazon-kinesis-client -->
+ <org.json.version>20240303</org.json.version><!-- Used by
google-cloud-bigquery and com.ibm.mq.jakarta.client -->
<reactor-core.version>3.7.11</reactor-core.version><!-- @sync
com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core
-->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>3.0.0</retrofit.version><!-- @sync
org.kiwiproject:consul-client:${consul-client-version} prop:retrofit.version -->
<rhino.version>1.7.15.1</rhino.version><!-- Used by Apache FOP, to
sync with transitive dependencies -->
- <rxjava3.version>3.1.8</rxjava3.version><!-- Used by
amazon-kinesis-client and infinispan-client-hotrod-jakarta -->
<saxon.version>${saxon-version}</saxon.version>
<smooks-bom.version>${smooks-version}</smooks-bom.version>
<smooks.version>2.2.1</smooks.version><!-- @sync
org.smooks:smooks-bom:${smooks-bom.version} prop:smooks.version -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8fc379b883..40f4dc1003 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7499,11 +7499,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.re2j</groupId>
- <artifactId>re2j</artifactId>
- <version>${re2j.version}</version>
- </dependency>
<dependency>
<groupId>com.ibm.cloud</groupId>
<artifactId>sdk-core</artifactId>
@@ -7818,11 +7813,6 @@
<artifactId>quarkus-mybatis-deployment</artifactId>
<version>${quarkiverse-mybatis.version}</version>
</dependency>
- <dependency>
- <groupId>io.reactivex.rxjava3</groupId>
- <artifactId>rxjava</artifactId>
- <version>${rxjava3.version}</version>
- </dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen</artifactId>
@@ -8534,46 +8524,6 @@
<artifactId>aws-crt</artifactId>
<version>${awscrt.version}</version>
</dependency>
- <!-- TODO: Remove this
https://github.com/apache/camel-quarkus/issues/7812 -->
- <dependency>
- <groupId>software.amazon.kinesis</groupId>
- <artifactId>amazon-kinesis-client</artifactId>
- <version>${amazon-kinesis-client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.github.classgraph</groupId>
- <artifactId>classgraph</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index b3ae4cfa63..87a50b409f 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7382,11 +7382,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.re2j</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>re2j</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.7</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>com.ibm.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>sdk-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7700,11 +7695,6 @@
<artifactId>quarkus-mybatis-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>io.reactivex.rxjava3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>rxjava</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.8</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>swagger-codegen</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -8416,45 +8406,6 @@
<artifactId>aws-crt</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.45.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>software.amazon.kinesis</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>amazon-kinesis-client</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>io.github.classgraph</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>classgraph</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>validation-api</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.apache.kafka</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>kafka-clients</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>checker-qual</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>*</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlinx</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>*</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>xalan</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xalan</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index e8d2cf3170..9903e63416 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7361,11 +7361,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.re2j</groupId>
- <artifactId>re2j</artifactId>
- <version>1.7</version>
- </dependency>
<dependency>
<groupId>com.ibm.cloud</groupId>
<artifactId>sdk-core</artifactId>
@@ -7644,11 +7639,6 @@
<artifactId>quarkus-mybatis-deployment</artifactId>
<version>2.4.2</version>
</dependency>
- <dependency>
- <groupId>io.reactivex.rxjava3</groupId>
- <artifactId>rxjava</artifactId>
- <version>3.1.8</version>
- </dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen</artifactId>
@@ -8279,45 +8269,6 @@
<artifactId>aws-crt</artifactId>
<version>0.45.1</version>
</dependency>
- <dependency>
- <groupId>software.amazon.kinesis</groupId>
- <artifactId>amazon-kinesis-client</artifactId>
- <version>3.1.3</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.github.classgraph</groupId>
- <artifactId>classgraph</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 533f11258e..c58d68912d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7361,11 +7361,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.re2j</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>re2j</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.7</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>com.ibm.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>sdk-core</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7644,11 +7639,6 @@
<artifactId>quarkus-mybatis-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.4.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>io.reactivex.rxjava3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>rxjava</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.8</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>swagger-codegen</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -8279,45 +8269,6 @@
<artifactId>aws-crt</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.45.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>software.amazon.kinesis</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>amazon-kinesis-client</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>3.1.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>io.github.classgraph</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>classgraph</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>validation-api</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.apache.kafka</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>kafka-clients</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>checker-qual</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>*</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlinx</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>*</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>xalan</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xalan</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
