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:45 UTC
[camel] branch main updated (85a0c563664 -> 52885321eb0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 85a0c563664 Sync deps
new 9278bdddb00 CAMEL-19003: Avoid using old guava versions
new 52885321eb0 camel-google - Upgrade dependencies
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 3 +-
.../camel-google/camel-google-calendar/pom.xml | 56 +++++++++++++++++-----
components/camel-google/camel-google-drive/pom.xml | 56 +++++++++++++++++-----
components/camel-google/camel-google-mail/pom.xml | 3 +-
.../camel-google/camel-google-sheets/pom.xml | 52 ++++++++++++++++----
components/camel-grpc/pom.xml | 4 +-
components/camel-ignite/pom.xml | 1 +
parent/pom.xml | 13 -----
8 files changed, 138 insertions(+), 50 deletions(-)
[camel] 01/02: CAMEL-19003: Avoid using old guava versions
Posted by da...@apache.org.
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>
[camel] 02/02: camel-google - Upgrade dependencies
Posted by da...@apache.org.
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 52885321eb0e65fa9ab2c174311a637106e1addb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 3 12:00:19 2023 +0100
camel-google - Upgrade dependencies
---
.../camel-google/camel-google-calendar/pom.xml | 56 +++++++++++++++++-----
components/camel-google/camel-google-drive/pom.xml | 56 +++++++++++++++++-----
.../camel-google/camel-google-sheets/pom.xml | 52 ++++++++++++++++----
components/camel-ignite/pom.xml | 1 +
4 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml
index dbf81cacc58..9c04e6f906c 100644
--- a/components/camel-google/camel-google-calendar/pom.xml
+++ b/components/camel-google/camel-google-calendar/pom.xml
@@ -44,6 +44,51 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-jackson2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-gson</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-apache-v2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-calendar</artifactId>
@@ -84,17 +129,6 @@
<artifactId>google-oauth-client-jetty</artifactId>
<version>${google-oauth-client-version}</version>
</dependency>
- <dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client-jackson2</artifactId>
- <version>${google-api-client-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml
index 25521c8ca68..501617d1b83 100644
--- a/components/camel-google/camel-google-drive/pom.xml
+++ b/components/camel-google/camel-google-drive/pom.xml
@@ -48,6 +48,51 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-jackson2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-gson</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-apache-v2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-drive</artifactId>
@@ -84,17 +129,6 @@
<artifactId>google-oauth-client-jetty</artifactId>
<version>${google-oauth-client-version}</version>
</dependency>
- <dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client-jackson2</artifactId>
- <version>${google-api-client-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml
index 7b2811573b6..7cf9bb4014f 100644
--- a/components/camel-google/camel-google-sheets/pom.xml
+++ b/components/camel-google/camel-google-sheets/pom.xml
@@ -44,25 +44,33 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+
<dependency>
- <groupId>com.google.api-client</groupId>
- <artifactId>google-api-client</artifactId>
- <version>${google-api-client-version}</version>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>1.42.3</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-jackson2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
<exclusion>
- <groupId>com.google.oauth-client</groupId>
- <artifactId>google-oauth-client</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.oauth-client</groupId>
- <artifactId>google-oauth-client</artifactId>
- <version>${google-oauth-client-version}</version>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client-gson</artifactId>
+ <version>1.42.3</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -72,8 +80,34 @@
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
- <artifactId>google-http-client-jackson2</artifactId>
+ <artifactId>google-http-client-apache-v2</artifactId>
+ <version>1.42.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api-client</groupId>
+ <artifactId>google-api-client</artifactId>
<version>${google-api-client-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.oauth-client</groupId>
+ <artifactId>google-oauth-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.oauth-client</groupId>
+ <artifactId>google-oauth-client</artifactId>
+ <version>${google-oauth-client-version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 72392881f45..3b9dd340abf 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -70,6 +70,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>31.1-jre</version>
<scope>test</scope>
</dependency>