This is an automated email from the ASF dual-hosted git repository. turcsanyi pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 56fecbb7d8 NIFI-9955 Upgraded ZooKeeper 3.4.14 to 3.5.9 56fecbb7d8 is described below commit 56fecbb7d819dd825298244cac4b58be9fb959e9 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Sat Apr 23 17:11:06 2022 -0500 NIFI-9955 Upgraded ZooKeeper 3.4.14 to 3.5.9 This closes #5995. Signed-off-by: Peter Turcsanyi <turcsa...@apache.org> --- nifi-external/nifi-spark-receiver/pom.xml | 5 ++++- nifi-nar-bundles/nifi-druid-bundle/pom.xml | 3 ++- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 3 ++- nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 +++++- nifi-nar-bundles/nifi-spark-bundle/pom.xml | 6 +++++- .../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 3 ++- .../nifi-hbase_2-client-service-bundle/pom.xml | 3 ++- nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 +++++- nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 3 ++- 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index f54fe640d6..9432b4ef3a 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -22,6 +22,9 @@ </parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-spark-receiver</artifactId> + <properties> + <zookeeper.version>3.5.9</zookeeper.version> + </properties> <dependencyManagement> <dependencies> <!-- Override commons-io:2.4 from spark-streaming --> @@ -46,7 +49,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml index 62114258fb..1f0caf9707 100644 --- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml @@ -27,6 +27,7 @@ <properties> <druid.version>0.9.1</druid.version> <tranquility.version>0.8.3</tranquility.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <dependencyManagement> @@ -141,7 +142,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> <!-- Override Netty 3 --> <dependency> diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index d68b70188e..534500296a 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -89,7 +89,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> <!-- Override ant --> <dependency> @@ -109,6 +109,7 @@ <hive.version>${hive3.version}</hive.version> <calcite.version>1.27.0</calcite.version> <calcite.avatica.version>1.6.0</calcite.avatica.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <build> diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml index 8407e6a09f..78b205e2f1 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml @@ -25,6 +25,10 @@ <artifactId>nifi-ranger-bundle</artifactId> <packaging>pom</packaging> + <properties> + <zookeeper.version>3.5.9</zookeeper.version> + </properties> + <modules> <module>nifi-ranger-plugin</module> <module>nifi-ranger-nar</module> @@ -37,7 +41,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> <!-- Override commons-io:2.5 from ranger --> <dependency> diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml index 17df0fb906..96a1468fc6 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml @@ -23,6 +23,10 @@ <artifactId>nifi-spark-bundle</artifactId> <packaging>pom</packaging> + <properties> + <zookeeper.version>3.5.9</zookeeper.version> + </properties> + <modules> <module>nifi-livy-nar</module> <module>nifi-livy-controller-service-api-nar</module> @@ -73,7 +77,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> </dependencies> </dependencyManagement> diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml index b284c3e108..8c5ef8910f 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml @@ -24,6 +24,7 @@ <packaging>pom</packaging> <properties> <hadoop.version>2.7.3</hadoop.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <modules> <module>nifi-hbase_1_1_2-client-service</module> @@ -107,7 +108,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> </dependencies> </dependencyManagement> 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 95c3244650..cf6a55a6f1 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 @@ -26,6 +26,7 @@ <properties> <hbase.version>2.2.2</hbase.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <modules> @@ -77,7 +78,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</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 abdda46a69..24651e999e 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml @@ -24,6 +24,10 @@ <artifactId>nifi-registry-ranger</artifactId> <packaging>pom</packaging> + <properties> + <zookeeper.version>3.5.9</zookeeper.version> + </properties> + <modules> <module>nifi-registry-ranger-assembly</module> <module>nifi-registry-ranger-jersey-bundle</module> @@ -70,7 +74,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>${zookeeper.version}</version> </dependency> </dependencies> </dependencyManagement> diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml index ce5f0f9c3b..a298e7abd5 100644 --- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml +++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml @@ -25,6 +25,7 @@ </parent> <properties> <curator.version>5.2.1</curator.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <dependencies> <dependency> @@ -44,7 +45,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.5.6</version> + <version>${zookeeper.version}</version> <exclusions> <exclusion> <groupId>log4j</groupId>