Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-9955 Upgraded ZooKeeper 3.4.14 to 3.5.9 

This closes #5995.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
This commit is contained in:
exceptionfactory 2022-04-23 17:11:06 -05:00 committed by Peter Turcsanyi
parent ac08d3311e
commit 56fecbb7d8
9 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nifi-external/nifi-spark-receiver/pom.xml
View File

@ -22,6 +22,9 @@
</parent> </parent>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-spark-receiver</artifactId> <artifactId>nifi-spark-receiver</artifactId>
<properties>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Override commons-io:2.4 from spark-streaming --> <!-- Override commons-io:2.4 from spark-streaming -->
@ -46,7 +49,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

3
nifi-nar-bundles/nifi-druid-bundle/pom.xml
View File

@ -27,6 +27,7 @@
<properties> <properties>
<druid.version>0.9.1</druid.version> <druid.version>0.9.1</druid.version>
<tranquility.version>0.8.3</tranquility.version> <tranquility.version>0.8.3</tranquility.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -141,7 +142,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
<!-- Override Netty 3 --> <!-- Override Netty 3 -->
<dependency> <dependency>

3
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -89,7 +89,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
<!-- Override ant --> <!-- Override ant -->
<dependency> <dependency>
@ -109,6 +109,7 @@
<hive.version>${hive3.version}</hive.version> <hive.version>${hive3.version}</hive.version>
<calcite.version>1.27.0</calcite.version> <calcite.version>1.27.0</calcite.version>
<calcite.avatica.version>1.6.0</calcite.avatica.version> <calcite.avatica.version>1.6.0</calcite.avatica.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties> </properties>
<build> <build>

6
nifi-nar-bundles/nifi-ranger-bundle/pom.xml
View File

@ -25,6 +25,10 @@
<artifactId>nifi-ranger-bundle</artifactId> <artifactId>nifi-ranger-bundle</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules> <modules>
<module>nifi-ranger-plugin</module> <module>nifi-ranger-plugin</module>
<module>nifi-ranger-nar</module> <module>nifi-ranger-nar</module>
@ -37,7 +41,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
<!-- Override commons-io:2.5 from ranger --> <!-- Override commons-io:2.5 from ranger -->
<dependency> <dependency>

6
nifi-nar-bundles/nifi-spark-bundle/pom.xml
View File

@ -23,6 +23,10 @@
<artifactId>nifi-spark-bundle</artifactId> <artifactId>nifi-spark-bundle</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules> <modules>
<module>nifi-livy-nar</module> <module>nifi-livy-nar</module>
<module>nifi-livy-controller-service-api-nar</module> <module>nifi-livy-controller-service-api-nar</module>
@ -73,7 +77,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

3
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
View File

@ -24,6 +24,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<hadoop.version>2.7.3</hadoop.version> <hadoop.version>2.7.3</hadoop.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties> </properties>
<modules> <modules>
<module>nifi-hbase_1_1_2-client-service</module> <module>nifi-hbase_1_1_2-client-service</module>
@ -107,7 +108,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

3
nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
View File

@ -26,6 +26,7 @@
<properties> <properties>
<hbase.version>2.2.2</hbase.version> <hbase.version>2.2.2</hbase.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties> </properties>
<modules> <modules>
@ -77,7 +78,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

6
nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
View File

@ -24,6 +24,10 @@
<artifactId>nifi-registry-ranger</artifactId> <artifactId>nifi-registry-ranger</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules> <modules>
<module>nifi-registry-ranger-assembly</module> <module>nifi-registry-ranger-assembly</module>
<module>nifi-registry-ranger-jersey-bundle</module> <module>nifi-registry-ranger-jersey-bundle</module>
@ -70,7 +74,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.14</version> <version>${zookeeper.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

3
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
View File

@ -25,6 +25,7 @@
</parent> </parent>
<properties> <properties>
<curator.version>5.2.1</curator.version> <curator.version>5.2.1</curator.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -44,7 +45,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.5.6</version> <version>${zookeeper.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>log4j</groupId>