This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6d00ce4fe5f0082d16fba26148c989b81341ab6a
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Mon Jun 5 15:02:38 2023 -0500
NIFI-11645 This closes #7342. Upgraded Guava from 31.1 to 32.0.0
Signed-off-by: Joe Witt <joew...@apache.org>
---
minifi/pom.xml | 2 +-
nifi-commons/nifi-property-protection-gcp/pom.xml | 7 +++++++
nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 14 ++++++++------
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 7 +++++++
nifi-nar-bundles/nifi-aws-bundle/pom.xml | 11 +++++++++++
nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +-
.../nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 2 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 7 +++++++
nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 6 ++++++
.../nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +-
.../nifi-jms-bundle/nifi-jms-processors/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 9 +++++++++
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
nifi-registry/nifi-registry-core/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-cli/pom.xml | 7 +++++++
15 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 4cf0650de1..40b13b15a8 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -449,7 +449,7 @@ limitations under the License.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml
b/nifi-commons/nifi-property-protection-gcp/pom.xml
index b310f338cf..9e4ef934fc 100644
--- a/nifi-commons/nifi-property-protection-gcp/pom.xml
+++ b/nifi-commons/nifi-property-protection-gcp/pom.xml
@@ -23,6 +23,7 @@
<artifactId>nifi-property-protection-gcp</artifactId>
<properties>
<gcp.sdk.version>26.15.0</gcp.sdk.version>
+ <guava.version>32.0.0-jre</guava.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -50,6 +51,12 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <!-- Override Guava 31.1 from google-cloud-kms -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-kms</artifactId>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index 12cdc413ed..0d248131db 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -20,6 +20,8 @@
<properties>
<accumulo.version>2.0.1</accumulo.version>
+ <accumulo.version>2.1.0</accumulo.version>
+ <guava.version>32.0.0-jre</guava.version>
</properties>
<artifactId>nifi-accumulo-bundle</artifactId>
@@ -58,12 +60,6 @@
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
</dependency>
- <!-- Override Guava from accumulo-core -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>31.1-jre</version>
- </dependency>
<!-- Override ZooKeeper from accumulo-core -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -118,6 +114,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Override Guava 31.1 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 59860d3163..49f2e8b1ea 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -27,6 +27,7 @@
<properties>
<atlas.version>2.3.0</atlas.version>
+ <guava.version>32.0.0-jre</guava.version>
</properties>
<modules>
@@ -116,6 +117,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Override Guava 25.1 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index cfdfb8151b..3a31371e21 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -39,4 +39,15 @@
<module>nifi-aws-parameter-value-providers</module>
<module>nifi-aws-parameter-providers</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override Guava 31.0.1 from amazon-kinesis-client -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.0.0-jre</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 7c5bf272f9..0bc4d07461 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.0-jre</version>
</dependency>
<!-- Override Apache Qpid Proton J for Azure EventHubs to resolve
PROTON-2347 -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
index 4aa8e23c7d..df287eac81 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 2775cbc6ad..c637999815 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -25,6 +25,8 @@
<properties>
<curator.version>5.5.0</curator.version>
<tika.version>2.6.0</tika.version>
+ <guava.version>32.0.0-jre</guava.version>
+ <org.opensaml.version>4.3.0</org.opensaml.version>
</properties>
<modules>
<module>nifi-framework</module>
@@ -501,6 +503,11 @@
<artifactId>netty</artifactId>
<version>${netty.3.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
index 4864f1e188..e9b7dc22f8 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
@@ -38,6 +38,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Override Guava 31.1 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.0.0-jre</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index 2ae2da6f43..e6a691356d 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
@@ -27,7 +27,7 @@
<properties>
<gremlin.version>3.6.4</gremlin.version>
<janusgraph.version>0.6.3</janusgraph.version>
- <guava.version>31.1-jre</guava.version>
+ <guava.version>32.0.0-jre</guava.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index 2b2c04d6c6..08618fc4e4 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -85,6 +85,12 @@
<version>5.15.15</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>32.0.0-jre</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
index f2cf6af8a2..33e08f2edb 100644
--- a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
@@ -21,6 +21,9 @@
</parent>
<artifactId>nifi-sql-reporting-bundle</artifactId>
<packaging>pom</packaging>
+ <properties>
+ <guava.version>32.0.0-jre</guava.version>
+ </properties>
<modules>
<module>nifi-sql-reporting-tasks</module>
<module>nifi-sql-reporting-nar</module>
@@ -38,6 +41,12 @@
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
</dependency>
+ <!-- Override Guava 31.1. from calcite-core -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index b034cb1c34..111cd991e4 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -305,7 +305,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
diff --git a/nifi-registry/nifi-registry-core/pom.xml
b/nifi-registry/nifi-registry-core/pom.xml
index 5c4ac23ef3..63ba5f1987 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -115,7 +115,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.0.0-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml
b/nifi-toolkit/nifi-toolkit-cli/pom.xml
index 18dabb053a..c32238ea0a 100644
--- a/nifi-toolkit/nifi-toolkit-cli/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml
@@ -24,6 +24,7 @@
<description>Tooling to make tls configuration easier</description>
<properties>
+ <guava.version>32.0.0-jre</guava.version>
<jline.version>3.23.0</jline.version>
</properties>
@@ -80,6 +81,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Override Guava 31.1 through nifi-framework-core -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos</artifactId>
