HBASE-28153 Upgrade zookeeper to a newer version (apache#5484)

Backport of apache#5475
Kota-SH · Nov 1, 2023 · 0d04a60 · 0d04a60
1 parent a208ba2
commit 0d04a60
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 182 deletions.
diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml
@@ -43,6 +43,11 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
@@ -155,13 +155,6 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-api</artifactId>
     </dependency>
-    <!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty</artifactId>
-      <version>${netty.hadoop.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
@@ -835,13 +835,6 @@
             </exclusion>
           </exclusions>
         </dependency>
-        <!-- Hadoop needs Netty 3.x at test scope for the minicluster>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-          <version>${netty.hadoop.version}</version>
-          <scope>test</scope>
-        </dependency-->
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minikdc</artifactId>

diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
@@ -143,6 +143,15 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- ZooKeeperServer needs the below dependencies, thus MiniZooKeeperCluster also needs them -->
+    <dependency>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+    </dependency>
   </dependencies>
 
   <build>