This is an automated email from the ASF dual-hosted git repository. mattyb149 pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 4d55615c7a NIFI-11709 Upgraded Guava from 32.0.0 to 32.0.1 4d55615c7a is described below commit 4d55615c7a866a45230d38fd23003de70a158922 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Tue Jun 20 10:12:04 2023 -0500 NIFI-11709 Upgraded Guava from 32.0.0 to 32.0.1 - Added version override for Guava 27 to 32.0.1 in Hadoop and Hive modules Signed-off-by: Matt Burgess <mattyb...@apache.org> --- minifi/pom.xml | 2 +- nifi-commons/nifi-property-protection-gcp/pom.xml | 2 +- nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 ++++++ nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml | 6 ++++++ nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 ++++++ nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 ++++++ nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-hbase_2-client-service-bundle/pom.xml | 6 ++++++ nifi-registry/nifi-registry-core/pom.xml | 2 +- nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 ++++++ nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- 21 files changed, 51 insertions(+), 15 deletions(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 5fc2298495..e4a5a856a0 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -453,7 +453,7 @@ limitations under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>32.0.0-jre</version> + <version>32.0.1-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 beeec5d0ca..1cd1fd278f 100644 --- a/nifi-commons/nifi-property-protection-gcp/pom.xml +++ b/nifi-commons/nifi-property-protection-gcp/pom.xml @@ -23,7 +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> + <guava.version>32.0.1-jre</guava.version> </properties> <dependencyManagement> <dependencies> diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index 01fb7dd174..0e9043b976 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -20,7 +20,7 @@ <properties> <accumulo.version>2.0.1</accumulo.version> - <guava.version>32.0.0-jre</guava.version> + <guava.version>32.0.1-jre</guava.version> </properties> <artifactId>nifi-accumulo-bundle</artifactId> diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index bc7f168e69..f8990c7592 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -27,7 +27,7 @@ <properties> <atlas.version>2.3.0</atlas.version> - <guava.version>32.0.0-jre</guava.version> + <guava.version>32.0.1-jre</guava.version> </properties> <modules> diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml index 067d068478..eb8acb854d 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>32.0.0-jre</version> + <version>32.0.1-jre</version> </dependency> </dependencies> </dependencyManagement> diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index 0463310eb1..80126bc814 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>32.0.0-jre</version> + <version>32.0.1-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 3693d343e3..171fb18714 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>32.0.0-jre</version> + <version>32.0.1-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 301434394d..1edad0da2e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -24,8 +24,8 @@ <description>NiFi: Framework Bundle</description> <properties> <curator.version>5.5.0</curator.version> + <guava.version>32.0.1-jre</guava.version> <tika.version>2.8.0</tika.version> - <guava.version>32.0.0-jre</guava.version> <org.opensaml.version>4.3.0</org.opensaml.version> </properties> <modules> diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml index 8565237d75..5a29ff3324 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>32.0.0-jre</version> + <version>32.0.1-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 bee06b7d69..f3db7431d7 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>32.0.0-jre</guava.version> + <guava.version>32.0.1-jre</guava.version> </properties> <dependencyManagement> <dependencies> diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml index e6397f0798..aee19e38c6 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml @@ -44,6 +44,12 @@ <artifactId>nimbus-jose-jwt</artifactId> <version>9.31</version> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml index 8123eb2a2c..7037b01946 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml @@ -82,6 +82,12 @@ </exclusion> </exclusions> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> <dependencies> diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index 42f4745bb8..ac1346bd98 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -115,6 +115,12 @@ </exclusion> </exclusions> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> </project> 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 f4293bf844..977da81761 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 @@ -88,7 +88,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>32.0.0-jre</version> + <version>32.0.1-jre</version> <scope>test</scope> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml index 4b4fd86f4e..84e8abe0ab 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml @@ -96,6 +96,12 @@ </exclusion> </exclusions> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml index b400c54260..35b96d93e8 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml @@ -22,7 +22,7 @@ <artifactId>nifi-sql-reporting-bundle</artifactId> <packaging>pom</packaging> <properties> - <guava.version>32.0.0-jre</guava.version> + <guava.version>32.0.1-jre</guava.version> </properties> <modules> <module>nifi-sql-reporting-tasks</module> diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 359a5bfe86..da1c6814e7 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>32.0.0-jre</version> + <version>32.0.1-jre</version> </dependency> <dependency> <groupId>com.networknt</groupId> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml index aaf49cb68f..bce9fb46ae 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml @@ -91,6 +91,12 @@ <artifactId>woodstox-core</artifactId> <version>5.4.0</version> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-registry/nifi-registry-core/pom.xml b/nifi-registry/nifi-registry-core/pom.xml index 18f8728df9..eb50278d1b 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>32.0.0-jre</version> + <version>32.0.1-jre</version> </dependency> </dependencies> </dependencyManagement> diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml index 3e602aba9f..f024bc79ae 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml @@ -72,6 +72,12 @@ <artifactId>nimbus-jose-jwt</artifactId> <version>9.31</version> </dependency> + <!-- Override Guava 27 --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.0.1-jre</version> + </dependency> </dependencies> </dependencyManagement> </project> diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index 4ec1486137..7ef81f4695 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -24,7 +24,7 @@ <description>Tooling to make tls configuration easier</description> <properties> - <guava.version>32.0.0-jre</guava.version> + <guava.version>32.0.1-jre</guava.version> <jline.version>3.23.0</jline.version> </properties>