NIFI-11645 This closes #7342. Upgraded Guava from 31.1 to 32.0.0

- Added selective overrides to upgrade transitive dependencies

Signed-off-by: Joe Witt <joewitt@apache.org>

minifi/pom.xml

@@ -439,7 +439,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>

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>

nifi-nar-bundles/nifi-accumulo-bundle/pom.xml

@@ -20,6 +20,7 @@
 
     <properties>
         <accumulo.version>2.1.0</accumulo.version>
+        <guava.version>32.0.0-jre</guava.version>
     </properties>
 
     <artifactId>nifi-accumulo-bundle</artifactId>
@@ -85,6 +86,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>

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>

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>

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>

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>

nifi-nar-bundles/nifi-framework-bundle/pom.xml

@@ -24,6 +24,7 @@
     <description>NiFi: Framework Bundle</description>
     <properties>
         <curator.version>5.5.0</curator.version>
+        <guava.version>32.0.0-jre</guava.version>
         <tika.version>2.8.0</tika.version>
         <org.opensaml.version>4.3.0</org.opensaml.version>
     </properties>
@@ -531,6 +532,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>

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>
 

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>

nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.0-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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>

nifi-nar-bundles/nifi-standard-bundle/pom.xml

@@ -294,7 +294,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>

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>

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>