You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/28 08:18:12 UTC
[camel] 02/03: CAMEL-19496 - Manage single version of Guava
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 970071cf1ceb83e805f82d54fa464cfd84e5579c
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 22:16:29 2023 +0200
CAMEL-19496 - Manage single version of Guava
---
camel-dependencies/pom.xml | 9 +--------
components/camel-bonita/pom.xml | 13 -------------
.../camel-google/camel-google-bigquery/pom.xml | 16 ----------------
.../camel-google/camel-google-functions/pom.xml | 16 ----------------
components/camel-google/camel-google-mail/pom.xml | 5 -----
components/camel-google/camel-google-pubsub/pom.xml | 6 ------
.../camel-google/camel-google-secret-manager/pom.xml | 16 ----------------
components/camel-google/camel-google-storage/pom.xml | 16 ----------------
components/camel-grpc/pom.xml | 2 +-
components/camel-guava-eventbus/pom.xml | 1 -
components/camel-hdfs/pom.xml | 9 ---------
components/camel-ignite/pom.xml | 1 -
components/camel-jira/pom.xml | 17 -----------------
components/camel-leveldb/pom.xml | 11 -----------
components/camel-oaipmh/pom.xml | 15 +--------------
components/camel-openstack/pom.xml | 13 -------------
components/camel-platform-http-vertx/pom.xml | 13 -------------
components/camel-pubnub/pom.xml | 7 -------
components/camel-rest-openapi/pom.xml | 15 +--------------
components/camel-xchange/pom.xml | 11 -----------
components/camel-zookeeper-master/pom.xml | 11 -----------
components/camel-zookeeper/pom.xml | 11 -----------
.../java/org/apache/camel/util/ObjectHelper.java | 15 +++++++++++++++
parent/pom.xml | 20 ++++++++++++--------
.../maven/camel-api-component-maven-plugin/pom.xml | 1 -
25 files changed, 31 insertions(+), 239 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b843cab761a..4b260a5f45a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -161,9 +161,7 @@
<google-cloud-bom-version>26.1.6</google-cloud-bom-version>
<google-cloud-functions-bom-version>2.2.0</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
- <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
<google-maps-services-version>2.2.0</google-maps-services-version>
<google-oauth-client-version>1.34.0</google-oauth-client-version>
<graaljs-version>22.3.0</graaljs-version>
@@ -171,15 +169,13 @@
<greenmail-version>2.0.0</greenmail-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
<grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
- <grpc-guava-version>32.0.0-jre</grpc-guava-version>
<grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-protobuf-version>3.22.2</grpc-protobuf-version>
<grpc-version>1.56.0</grpc-version>
<gson-version>2.10.1</gson-version>
- <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
+ <guava-version>32.0.0-jre</guava-version>
<guice3-version>3.0</guice3-version>
- <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
<hadoop3-version>3.3.5</hadoop3-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-base-version>2.3</hapi-base-version>
@@ -263,7 +259,6 @@
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
<jgroups-version>4.2.17.Final</jgroups-version>
- <jira-guava-version>32.0.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
<jnats-version>2.16.12</jnats-version>
<jodatime2-version>2.11.1</jodatime2-version>
@@ -300,7 +295,6 @@
<kubernetes-model-version>6.7.2</kubernetes-model-version>
<kudu-version>1.16.0</kudu-version>
<leveldb-api-version>0.12</leveldb-api-version>
- <leveldb-guava-version>32.0.0-jre</leveldb-guava-version>
<leveldb-version>0.12</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version>
<libphonenumber-version>8.13.3</libphonenumber-version>
@@ -458,7 +452,6 @@
<woodstox-version>4.4.1</woodstox-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xbean-spring-version>4.21</xbean-spring-version>
- <xchange-guava-version>32.0.0-jre</xchange-guava-version>
<xchange-version>5.0.14</xchange-version>
<xerces-version>2.12.2</xerces-version>
<xml-apis-ext-version>1.3.04</xml-apis-ext-version>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 1e2bddfffcc..fcbe5d27a1f 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -69,19 +69,6 @@
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-google/camel-google-bigquery/pom.xml b/components/camel-google/camel-google-bigquery/pom.xml
index 738984c0717..bef05254527 100644
--- a/components/camel-google/camel-google-bigquery/pom.xml
+++ b/components/camel-google/camel-google-bigquery/pom.xml
@@ -37,12 +37,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -58,16 +52,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
diff --git a/components/camel-google/camel-google-functions/pom.xml b/components/camel-google/camel-google-functions/pom.xml
index 2a1174433dc..fbb7ef0f7d3 100644
--- a/components/camel-google/camel-google-functions/pom.xml
+++ b/components/camel-google/camel-google-functions/pom.xml
@@ -38,12 +38,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-functions-bom</artifactId>
@@ -61,16 +55,6 @@
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-functions</artifactId>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 946d1f82d17..d911b714674 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -45,11 +45,6 @@
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-mail-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 6e472a4d2fc..3c07936b4a7 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -48,12 +48,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
diff --git a/components/camel-google/camel-google-secret-manager/pom.xml b/components/camel-google/camel-google-secret-manager/pom.xml
index 93932062b46..4916f16a8ab 100644
--- a/components/camel-google/camel-google-secret-manager/pom.xml
+++ b/components/camel-google/camel-google-secret-manager/pom.xml
@@ -38,12 +38,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-secretmanager-bom</artifactId>
@@ -71,16 +65,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-secretmanager</artifactId>
diff --git a/components/camel-google/camel-google-storage/pom.xml b/components/camel-google/camel-google-storage/pom.xml
index 758475958b0..3f0d99f4e60 100644
--- a/components/camel-google/camel-google-storage/pom.xml
+++ b/components/camel-google/camel-google-storage/pom.xml
@@ -34,12 +34,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -59,16 +53,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 941ec9b5dde..dc58353348e 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -250,7 +250,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${grpc-guava-version}</version>
+ <version>${guava-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index db5b7bc1006..0a1158f1c61 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 8fcb7704838..12f1026ade1 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -53,10 +53,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -75,11 +71,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${hadoop3-guava-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index e4a10b3a49b..3d15594c1db 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -71,7 +71,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index 979ed06d372..677792dfd6c 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -49,17 +49,8 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${jira-guava-version}</version>
- </dependency>
<!-- atlassian jira dependencies -->
<dependency>
@@ -82,10 +73,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -97,10 +84,6 @@
<groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
<exclusion>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 607948922c3..34e559654d0 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -54,17 +54,6 @@
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${leveldb-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${leveldb-guava-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml
index 23e3ec77189..b7af5b9bb37 100644
--- a/components/camel-oaipmh/pom.xml
+++ b/components/camel-oaipmh/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: OAIPMH</name>
<description>Camel OAI-PMH support</description>
-
+
<dependencies>
<!-- camel -->
<dependency>
@@ -60,19 +60,6 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 367d060da8a..9fcda89430d 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -77,19 +77,6 @@
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml
index ecf2f3dff22..2671897939b 100644
--- a/components/camel-platform-http-vertx/pom.xml
+++ b/components/camel-platform-http-vertx/pom.xml
@@ -102,19 +102,6 @@
<version>${rest-assured-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 601bc8b0c49..d75f32541da 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -76,13 +76,6 @@
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 0f88e93336d..66b35aaf26f 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -49,7 +49,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest</artifactId>
</dependency>
-
+
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-models</artifactId>
@@ -104,19 +104,6 @@
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index cb596f3d4db..2ec39c70f08 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -55,17 +55,6 @@
<artifactId>xchange-binance</artifactId>
<version>${xchange-version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${xchange-guava-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index abaa1629dd9..2911b621414 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -66,17 +66,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 35adf3759f7..6718f80efa9 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -72,17 +72,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
index 8544d492b4d..eb37a1e4384 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -159,6 +159,21 @@ public final class ObjectHelper {
return value;
}
+ /**
+ * Asserts that the given {@code value} is neither {@code null} nor an emptyString.
+ *
+ * @param value the value to test
+ * @param name the key that resolved the value
+ * @return the passed {@code value} as is
+ * @throws IllegalArgumentException is thrown if assertion fails
+ */
+ public static String notNullOrEmpty(String value, String name) {
+ if (value == null || value.isEmpty()) {
+ throw new IllegalArgumentException(name + " must be specified and non-empty");
+ }
+ return value;
+ }
+
/**
* Asserts whether the value is <b>not</b> <tt>null</tt>
*
diff --git a/parent/pom.xml b/parent/pom.xml
index bcee555b6c8..14764df3f74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,9 +182,7 @@
<google-cloud-bom-version>26.1.6</google-cloud-bom-version>
<google-cloud-functions-bom-version>2.2.0</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
- <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
<graaljs-version>22.3.0</graaljs-version>
<graphql-java-version>18.4</graphql-java-version>
<greenmail-version>2.0.0</greenmail-version>
@@ -192,15 +190,13 @@
<grpc-version>1.56.0</grpc-version>
<!-- keep grpc-google-auth-library-version in sync with that used by grpc-auth -->
<grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
- <grpc-guava-version>32.0.0-jre</grpc-guava-version>
<grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-protobuf-version>3.22.2</grpc-protobuf-version>
<gson-version>2.10.1</gson-version>
- <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
+ <guava-version>32.0.0-jre</guava-version>
<guice3-version>3.0</guice3-version>
<hadoop3-version>3.3.5</hadoop3-version>
- <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>
<hapi-base-version>2.3</hapi-base-version>
@@ -283,7 +279,6 @@
<jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
- <jira-guava-version>32.0.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
<libthrift-version>0.18.1</libthrift-version>
<jodatime2-version>2.11.1</jodatime2-version>
@@ -322,7 +317,6 @@
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>
<leveldb-version>0.12</leveldb-version>
- <leveldb-guava-version>32.0.0-jre</leveldb-guava-version>
<libphonenumber-version>8.13.3</libphonenumber-version>
<!-- virtual dependency only used by Eclipse m2e -->
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
@@ -483,7 +477,6 @@
<xbean-spring-version>4.21</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xchange-version>5.0.14</xchange-version>
- <xchange-guava-version>32.0.0-jre</xchange-guava-version>
<xerces-version>2.12.2</xerces-version>
<!-- needed to manage the xml-apis version in camel-xmljson -->
<xml-apis-version>1.4.01</xml-apis-version>
@@ -2749,6 +2742,17 @@
<artifactId>gson</artifactId>
<version>${gson-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 345954ab1cc..1e8a55c1a09 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -144,7 +144,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
</dependency>
<!-- logging -->