HDDS-8045. Dependency convergence error for zookeeper (#4329)
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 828dc7e..0f2a6cc 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -296,6 +296,7 @@
com.google.inject.extensions:guice-servlet
com.google.inject:guice
com.google.j2objc:j2objc-annotations
+ com.googlecode.json-simple:json-simple
com.jolbox:bonecp
com.lmax:disruptor
com.nimbusds:nimbus-jose-jwt
@@ -366,6 +367,8 @@
org.apache.commons:commons-lang3
org.apache.commons:commons-pool2
org.apache.commons:commons-text
+ org.apache.curator:curator-client
+ org.apache.curator:curator-framework
org.apache.derby:derby
org.apache.hadoop:hadoop-annotations
org.apache.hadoop:hadoop-auth
@@ -411,6 +414,8 @@
org.apache.ratis:ratis-thirdparty-misc
org.apache.ratis:ratis-tools
org.apache.thrift:libthrift
+ org.apache.zookeeper:zookeeper
+ org.apache.zookeeper:zookeeper-jute
org.codehaus.jackson:jackson-core-asl
org.codehaus.jackson:jackson-jaxrs
org.codehaus.jackson:jackson-mapper-asl
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index d9233fb..6f0b983 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -270,4 +270,5 @@
share/ozone/lib/weld-servlet.Final.jar
share/ozone/lib/woodstox-core.jar
share/ozone/lib/zookeeper.jar
+share/ozone/lib/zookeeper-jute.jar
share/ozone/lib/zstd-jni.jar
diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml
index 7f8af06..f7ff6e3 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -115,7 +115,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<scope>runtime</scope>
- <version>2.4.0</version>
+ <version>4.2.0</version>
<!-- These were excluded as non of them is used in the HttpFS module, but all of them would be a new unnecessary
dependency to the Ozone project, we would also need to update the jar-report.txt with that. -->
<exclusions>
@@ -124,6 +124,10 @@
<artifactId>commons-math</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -140,8 +144,8 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index a7f2562..a06970e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,7 @@
<junit4.version>4.13.1</junit4.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<junit.platform.version>1.8.2</junit.platform.version>
+ <zookeeper.version>3.5.6</zookeeper.version>
<!-- Maven protoc compiler -->
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
@@ -1200,6 +1201,11 @@
<version>${commons-text.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
