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-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new dca1165 Unmanage unnecessary google dependencies fix #2689
dca1165 is described below
commit dca1165117085f9e15414654ce20aa5730109e81
Author: Peter Palaga <[email protected]>
AuthorDate: Mon Jun 21 13:08:15 2021 +0200
Unmanage unnecessary google dependencies fix #2689
---
pom.xml | 9 ++-------
poms/bom/pom.xml | 60 +++++++++++++++++++++++---------------------------------
2 files changed, 26 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1f55a6f..ca058a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,10 +73,6 @@
<fommil.netlib.core.version>1.1.2</fommil.netlib.core.version><!--
Mess in Weka transitive deps -->
<jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive
dependencies of Spark and Splunk -->
<github-api.version>1.111</github-api.version><!-- Used in a Groovy
script bellow -->
- <google-api-common.version>1.10.1</google-api-common.version> <!--
Mess in google-cloud-bom -->
- <google-http-client.version>1.38.0</google-http-client.version>
-
<google-http-client-jackson2.version>1.38.0</google-http-client-jackson2.version>
<!-- Mess in google-cloud-bom -->
-
<google-auth-library-oauth2-http.version>0.22.0</google-auth-library-oauth2-http.version>
<!-- Mess in google-cloud-bom -->
<guava.version>29.0-jre</guava.version>
<graalvm.version>21.1.0</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
<gson.version>2.8.6</gson.version><!-- @sync
com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version}
dep:com.google.code.gson:gson -->
@@ -107,8 +103,8 @@
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in
hdfs transitive deps -->
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
<okio.version>${squareup-okio-version}</okio.version>
- <opencensus.version>0.28.0</opencensus.version><!-- mess in
google-pubsub deps -->
- <perfmark.version>0.23.0</perfmark.version><!-- mess in google-pubsub
deps -->
+ <opencensus.version>0.28.3</opencensus.version><!-- mess in
google-pubsub, google-cloud-functions and grpc deps, TODO
https://github.com/apache/camel-quarkus/issues/2816 -->
+ <perfmark.version>0.23.0</perfmark.version><!-- mess in google-pubsub
deps, TODO https://github.com/apache/camel-quarkus/issues/2816 -->
<protobuf.version>${protobuf-version}</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
@@ -170,7 +166,6 @@
<!-- NOTE: We pin to this version due to
https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-
<proto-google-common-protos.version>1.17.0</proto-google-common-protos.version>
<rpkgtests-maven-plugin.version>0.9.0</rpkgtests-maven-plugin.version>
<!-- Plugin configuration through properties -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index ed0a056..88cae15 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -915,11 +915,23 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-calendar</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-drive</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -930,6 +942,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-mail</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -950,6 +968,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-sheets</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -5692,26 +5716,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.api</groupId>
- <artifactId>api-common</artifactId>
- <version>${google-api-common.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.api.grpc</groupId>
- <artifactId>proto-google-common-protos</artifactId>
- <version>${proto-google-common-protos.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.auth</groupId>
- <artifactId>google-auth-library-credentials</artifactId>
- <version>${google-auth-library-oauth2-http.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.auth</groupId>
- <artifactId>google-auth-library-oauth2-http</artifactId>
- <version>${google-auth-library-oauth2-http.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -5722,22 +5726,6 @@
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client</artifactId>
- <version>${google-http-client.version}</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>${google-http-client-jackson2.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
