This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 59d4488 CAMEL-15896: Upgrade google-cloud-pubsub to 1.109.0 (#4687)
59d4488 is described below
commit 59d44885868e24065d0ad798370d91b4ec37dd4a
Author: James Netherton <jamesnether...@users.noreply.github.com>
AuthorDate: Thu Nov 26 15:29:38 2020 +0000
CAMEL-15896: Upgrade google-cloud-pubsub to 1.109.0 (#4687)
---
camel-dependencies/pom.xml | 12 ------------
components/camel-google-pubsub/pom.xml | 24 ++++++++++++++++++------
parent/pom.xml | 12 ------------
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 258510e..17609a9 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -149,7 +149,6 @@
<commons-validator-version>1.7</commons-validator-version>
<compiler.fork>true</compiler.fork>
<compress-lzf-version>1.0.4</compress-lzf-version>
- <conscrypt-uber-version>2.2.1</conscrypt-uber-version>
<consul-client-version>1.4.2</consul-client-version>
<corda-version>4.6</corda-version>
<couchbase-client-version>3.0.9</couchbase-client-version>
@@ -224,28 +223,17 @@
<glassfish-jaxb-runtime-version>2.3.3</glassfish-jaxb-runtime-version>
<gmetric4j-version>1.0.10</gmetric4j-version>
<google-api-client-version>1.22.0</google-api-client-version>
- <google-api-common-version>1.8.1</google-api-common-version>
<google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version>
<google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
<google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version>
<google-api-services-sheets-version>v4-rev551-1.22.0</google-api-services-sheets-version>
- <google-auto-value-version>1.7</google-auto-value-version>
<google-cloud-bom-version>16.1.0</google-cloud-bom-version>
<google-cloud-guava-version>30.0-jre</google-cloud-guava-version>
- <google-cloud-pubsub-version>1.105.0</google-cloud-pubsub-version>
- <google-errorprone-version>2.3.3</google-errorprone-version>
<google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version>
<google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version>
- <google-gax-version>1.50.1</google-gax-version>
<google-guava-version>19.0</google-guava-version>
- <google-http-client-version>1.33.0</google-http-client-version>
- <google-http-jackson2-version>1.32.1</google-http-jackson2-version>
- <google-j2objc-version>1.3</google-j2objc-version>
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-maps-services-version>0.10.1</google-maps-services-version>
- <google-proto-common-version>1.17.0</google-proto-common-version>
- <google-proto-iam-version>0.13.0</google-proto-iam-version>
- <google-pubsub-guava-version>28.2-jre</google-pubsub-guava-version>
<graphql-java-version>14.0</graphql-java-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
<grpc-google-auth-library-version>0.19.0</grpc-google-auth-library-version>
diff --git a/components/camel-google-pubsub/pom.xml
b/components/camel-google-pubsub/pom.xml
index 37aafa8..138e7db 100644
--- a/components/camel-google-pubsub/pom.xml
+++ b/components/camel-google-pubsub/pom.xml
@@ -38,6 +38,24 @@
<componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
</properties>
+ <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>
+ <version>${google-cloud-bom-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -46,12 +64,6 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
- <version>${google-cloud-pubsub-version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-pubsub-guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index f6d84a9..dc26ce0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,7 +131,6 @@
<commons-text-version>1.9</commons-text-version>
<commons-validator-version>1.7</commons-validator-version>
<compress-lzf-version>1.0.4</compress-lzf-version>
- <conscrypt-uber-version>2.2.1</conscrypt-uber-version>
<consul-client-version>1.4.2</consul-client-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<corda-version>4.6</corda-version>
@@ -206,25 +205,14 @@
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmetric4j-version>1.0.10</gmetric4j-version>
<google-guava-version>19.0</google-guava-version>
- <google-pubsub-guava-version>28.2-jre</google-pubsub-guava-version>
<google-api-client-version>1.22.0</google-api-client-version>
- <google-api-common-version>1.8.1</google-api-common-version>
<google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
- <google-auto-value-version>1.7</google-auto-value-version>
<google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version>
<google-api-services-sheets-version>v4-rev551-1.22.0</google-api-services-sheets-version>
<google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version>
<google-cloud-bom-version>16.1.0</google-cloud-bom-version>
<google-cloud-guava-version>30.0-jre</google-cloud-guava-version>
- <google-cloud-pubsub-version>1.105.0</google-cloud-pubsub-version>
- <google-errorprone-version>2.3.3</google-errorprone-version>
- <google-gax-version>1.50.1</google-gax-version>
- <google-http-client-version>1.33.0</google-http-client-version>
- <google-http-jackson2-version>1.32.1</google-http-jackson2-version>
- <google-j2objc-version>1.3</google-j2objc-version>
<google-mail-guava-version>17.0</google-mail-guava-version>
- <google-proto-common-version>1.17.0</google-proto-common-version>
- <google-proto-iam-version>0.13.0</google-proto-iam-version>
<graphql-java-version>14.0</graphql-java-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
<grpc-version>1.28.1</grpc-version>
