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.
This commit is contained in:
exceptionfactory 2021-11-01 08:21:54 -05:00 committed by Nathan Gough
parent 0e09750a4d
commit c1e54276b8
3 changed files with 11 additions and 25 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>