You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/05/03 11:51:42 UTC
[nifi] branch main updated: NIFI-9980 Corrected conflicting GCP dependencies
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 0f6679f2df NIFI-9980 Corrected conflicting GCP dependencies
0f6679f2df is described below
commit 0f6679f2df9a94b288ddb5c2be1ea58e223eb27c
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon May 2 11:51:39 2022 -0500
NIFI-9980 Corrected conflicting GCP dependencies
- Replaced google-cloud-bom 0.172.0 with libraries-bom 25.2.0 in nifi-gcp-bundle
- Removed specific versions from Google dependencies in nifi-gcp-processors and nifi-gcp-services-api
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #6010.
---
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 2 --
.../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 12 ------------
nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 12 +++---------
3 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
index abbd6e0a7f..78eaa2f2ef 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
- <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -108,7 +107,6 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsublite</artifactId>
- <version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
index 2c68b13e15..0be194c235 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
@@ -25,17 +25,6 @@
<artifactId>nifi-gcp-services-api</artifactId>
<packaging>jar</packaging>
- <dependencyManagement>
- <dependencies>
- <!-- Override Guava version from google-auth-library-oauth2-http -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -44,7 +33,6 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
- <version>1.2.1</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
index 8566a3a5df..7160193f7b 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
@@ -26,24 +26,18 @@
<packaging>pom</packaging>
<properties>
- <google.cloud.sdk.version>0.172.0</google.cloud.sdk.version>
+ <google.libraries.version>25.2.0</google.libraries.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <!-- https://github.com/googleapis/java-cloud-bom -->
<groupId>com.google.cloud</groupId>
- <artifactId>google-cloud-bom</artifactId>
- <version>${google.cloud.sdk.version}</version>
+ <artifactId>libraries-bom</artifactId>
+ <version>${google.libraries.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
- </dependency>
</dependencies>
</dependencyManagement>