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 2024/09/06 15:42:42 UTC
(nifi) branch main updated: NIFI-13583 Overrode google-auth-library-oauth2-http version to 1.25.0
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 a7112a60ec NIFI-13583 Overrode google-auth-library-oauth2-http version to 1.25.0
a7112a60ec is described below
commit a7112a60ec623f16fe9bc5005c31fb32a2eefc25
Author: Peter Turcsanyi <tu...@apache.org>
AuthorDate: Thu Sep 5 18:59:49 2024 +0200
NIFI-13583 Overrode google-auth-library-oauth2-http version to 1.25.0
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #9235.
---
.../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 6 ++++++
nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
index c1685fc203..7845b81823 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
@@ -93,6 +93,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
index 17e0dac23f..8950414eae 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
<properties>
- <google.libraries.version>26.43.0</google.libraries.version>
+ <google.libraries.version>26.45.0</google.libraries.version>
</properties>
<dependencyManagement>
@@ -37,6 +37,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Override google-auth-library-oauth2-http in order to overcome https://github.com/googleapis/google-auth-library-java/issues/1387.
+ This should be removed once libraries-bom brings 1.25.0 or newer. -->
+ <dependency>
+ <groupId>com.google.auth</groupId>
+ <artifactId>google-auth-library-oauth2-http</artifactId>
+ <version>1.25.0</version>
+ </dependency>
<!-- Override Guava 31.1 -->
<dependency>
<groupId>com.google.guava</groupId>