You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/02/03 11:00:46 UTC
[camel] 01/02: CAMEL-19003: Avoid using old guava versions
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9278bdddb00b5ce74f976b48f0b61601352ce85b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 3 10:18:20 2023 +0100
CAMEL-19003: Avoid using old guava versions
---
camel-dependencies/pom.xml | 3 +--
components/camel-google/camel-google-mail/pom.xml | 3 ++-
components/camel-grpc/pom.xml | 4 +---
parent/pom.xml | 13 -------------
4 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 81ff2ee29c8..aad1f0be5e6 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -190,8 +190,7 @@
<jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
<gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
- <google-guava-version>20.0</google-guava-version>
- <google-api-client-version>1.32.1</google-api-client-version>
+ <google-api-client-version>1.35.2</google-api-client-version>
<google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
<google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
<google-api-services-sheets-version>v4-rev20210629-1.32.1</google-api-services-sheets-version>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 93210915ea7..4a72f3f8677 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -48,7 +48,8 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
+ <!-- TODO: can we upgrade - test this component with real gmail account -->
+ <version>20.0</version>
</dependency>
<dependency>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index c0fa6ba50b4..87497b4997a 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -33,8 +33,6 @@
<description>Camel component for gRPC (Remote Procedure Call) support</description>
<properties>
- <!-- gRPC requires strong own of the Google Guava version -->
- <google-guava-version>${grpc-guava-version}</google-guava-version>
<protobuf-version>${grpc-protobuf-version}</protobuf-version>
</properties>
@@ -272,7 +270,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
+ <version>${grpc-guava-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 04c2e45f18c..a8c23f0b207 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,6 @@
<jakarta-jws-api-version>3.0.0</jakarta-jws-api-version>
<gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
- <google-guava-version>20.0</google-guava-version>
<google-api-client-version>1.35.2</google-api-client-version>
<google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
<google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
@@ -3158,18 +3157,6 @@
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- optional hapi dependencies -->
<dependency>
<groupId>ca.uhn.hapi</groupId>