This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 488ca1bcfde22597e9d25038864ddbbb22fbf844 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Mon Nov 1 08:21:54 2021 -0500 NIFI-9355 Upgraded Apache Curator from 4.2.0 to 5.2.0 - Removed unused Curator dependency declaration from MiNiFi Signed-off-by: Nathan Gough <thena...@gmail.com> This closes #5503. --- minifi/pom.xml | 18 ------------------ nifi-nar-bundles/nifi-framework-bundle/pom.xml | 10 ++++++---- nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 8 +++++--- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 4fc3c28..46583ea 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -956,24 +956,6 @@ limitations under the License. <version>3.5.5</version> </dependency> <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> - <version>2.11.0</version> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>2.11.0</version> - </dependency> - - <!-- Test Dependencies for testing interactions with ZooKeeper --> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>2.9.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>6.8.8</version> diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 1721585..bf79d07 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -23,8 +23,10 @@ <packaging>pom</packaging> <description>NiFi: Framework Bundle</description> <properties> + <curator.version>5.2.0</curator.version> <spring.version>5.3.11</spring.version> <spring.security.version>5.5.2</spring.security.version> + <zookeeper.version>3.5.9</zookeeper.version> </properties> <modules> <module>nifi-framework</module> @@ -595,7 +597,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>4.2.0</version> + <version>${curator.version}</version> <scope>test</scope> </dependency> <dependency> @@ -612,12 +614,12 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.5.6</version> + <version>${zookeeper.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> - <version>4.2.0</version> + <version>${curator.version}</version> <exclusions> <exclusion> <groupId>org.apache.zookeeper</groupId> @@ -628,7 +630,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>4.2.0</version> + <version>${curator.version}</version> <exclusions> <exclusion> <groupId>org.apache.zookeeper</groupId> diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml index 7ff80b1..8d11e67 100644 --- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml +++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml @@ -23,7 +23,9 @@ <artifactId>nifi-toolkit</artifactId> <version>1.15.1-SNAPSHOT</version> </parent> - + <properties> + <curator.version>5.2.0</curator.version> + </properties> <dependencies> <dependency> <groupId>commons-cli</groupId> @@ -78,13 +80,13 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>4.2.0</version> + <version>${curator.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> - <version>4.2.0</version> + <version>${curator.version}</version> <scope>test</scope> </dependency> </dependencies>