1
0
mirror of https://github.com/apache/nifi.git synced 2025-02-27 14:09:52 +00:00

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 <mattyb149@apache.org>
This commit is contained in:
exceptionfactory 2023-06-20 10:12:04 -05:00 committed by Matt Burgess
parent b9561ecc68
commit 4d55615c7a
21 changed files with 51 additions and 15 deletions
minifi
nifi-commons/nifi-property-protection-gcp
nifi-nar-bundles
nifi-accumulo-bundle
nifi-atlas-bundle
nifi-aws-bundle
nifi-azure-bundle
nifi-evtx-bundle/nifi-evtx-processors
nifi-framework-bundle
nifi-gcp-bundle
nifi-graph-bundle/nifi-graph-test-clients
nifi-hadoop-libraries-bundle
nifi-hive-bundle/nifi-hive-test-utils
nifi-iceberg-bundle
nifi-jms-bundle/nifi-jms-processors
nifi-ranger-bundle
nifi-sql-reporting-bundle
nifi-standard-bundle
nifi-standard-services/nifi-hbase_2-client-service-bundle
nifi-registry
nifi-registry-core
nifi-registry-extensions/nifi-registry-ranger
nifi-toolkit/nifi-toolkit-cli

@ -453,7 +453,7 @@ limitations under the License.
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

@ -23,7 +23,7 @@
<artifactId>nifi-property-protection-gcp</artifactId> <artifactId>nifi-property-protection-gcp</artifactId>
<properties> <properties>
<gcp.sdk.version>26.15.0</gcp.sdk.version> <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> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>

@ -20,7 +20,7 @@
<properties> <properties>
<accumulo.version>2.0.1</accumulo.version> <accumulo.version>2.0.1</accumulo.version>
<guava.version>32.0.0-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
</properties> </properties>
<artifactId>nifi-accumulo-bundle</artifactId> <artifactId>nifi-accumulo-bundle</artifactId>

@ -27,7 +27,7 @@
<properties> <properties>
<atlas.version>2.3.0</atlas.version> <atlas.version>2.3.0</atlas.version>
<guava.version>32.0.0-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
</properties> </properties>
<modules> <modules>

@ -46,7 +46,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
<!-- Override Apache Qpid Proton J for Azure EventHubs to resolve PROTON-2347 --> <!-- Override Apache Qpid Proton J for Azure EventHubs to resolve PROTON-2347 -->
<dependency> <dependency>

@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

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

@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

@ -27,7 +27,7 @@
<properties> <properties>
<gremlin.version>3.6.4</gremlin.version> <gremlin.version>3.6.4</gremlin.version>
<janusgraph.version>0.6.3</janusgraph.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> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>

@ -44,6 +44,12 @@
<artifactId>nimbus-jose-jwt</artifactId> <artifactId>nimbus-jose-jwt</artifactId>
<version>9.31</version> <version>9.31</version>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

@ -82,6 +82,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>

@ -115,6 +115,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

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

@ -96,6 +96,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

@ -22,7 +22,7 @@
<artifactId>nifi-sql-reporting-bundle</artifactId> <artifactId>nifi-sql-reporting-bundle</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<guava.version>32.0.0-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
</properties> </properties>
<modules> <modules>
<module>nifi-sql-reporting-tasks</module> <module>nifi-sql-reporting-tasks</module>

@ -305,7 +305,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.networknt</groupId> <groupId>com.networknt</groupId>

@ -91,6 +91,12 @@
<artifactId>woodstox-core</artifactId> <artifactId>woodstox-core</artifactId>
<version>5.4.0</version> <version>5.4.0</version>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

@ -115,7 +115,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>32.0.0-jre</version> <version>32.0.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

@ -72,6 +72,12 @@
<artifactId>nimbus-jose-jwt</artifactId> <artifactId>nimbus-jose-jwt</artifactId>
<version>9.31</version> <version>9.31</version>
</dependency> </dependency>
<!-- Override Guava 27 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

@ -24,7 +24,7 @@
<description>Tooling to make tls configuration easier</description> <description>Tooling to make tls configuration easier</description>
<properties> <properties>
<guava.version>32.0.0-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
<jline.version>3.23.0</jline.version> <jline.version>3.23.0</jline.version>
</properties> </properties>