From c1e54276b872e2c36150c16ed05d589bdac03a3b Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Mon, 1 Nov 2021 08:21:54 -0500
Subject: [PATCH] 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 <thenatog@gmail.com>

This closes #5503.
---
 minifi/pom.xml                                 | 18 ------------------
 nifi-nar-bundles/nifi-framework-bundle/pom.xml | 10 ++++++----
 .../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 079ccff414..56fffef065 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -975,24 +975,6 @@ limitations under the License.
                 <artifactId>zookeeper</artifactId>
                 <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>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 031253175d..0c032ea609 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 dd40eb3f7c..ce12e3459f 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.16.0-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>