Skip to content

Commit 373b8b8

Browse files
authored
HBASE-28153 Upgrade zookeeper to a newer version (#5484) (#5490)
Backport of #5475 (cherry picked from commit 0d04a60) Signed-off-by: Andrew Purtell <apurtell@apache.org>
1 parent 57fea96 commit 373b8b8

4 files changed

Lines changed: 94 additions & 175 deletions

File tree

hbase-it/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,6 @@
151151
<groupId>org.apache.htrace</groupId>
152152
<artifactId>htrace-core4</artifactId>
153153
</dependency>
154-
<!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
155-
<dependency>
156-
<groupId>io.netty</groupId>
157-
<artifactId>netty</artifactId>
158-
<version>${netty.hadoop.version}</version>
159-
<scope>test</scope>
160-
</dependency>
161154
<dependency>
162155
<groupId>org.slf4j</groupId>
163156
<artifactId>jcl-over-slf4j</artifactId>

hbase-server/pom.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -803,13 +803,11 @@
803803
</exclusion>
804804
</exclusions>
805805
</dependency>
806-
<!-- Hadoop needs Netty 3.x at test scope for the minicluster>
807806
<dependency>
808-
<groupId>io.netty</groupId>
809-
<artifactId>netty</artifactId>
810-
<version>${netty.hadoop.version}</version>
807+
<groupId>org.apache.hadoop</groupId>
808+
<artifactId>hadoop-minikdc</artifactId>
811809
<scope>test</scope>
812-
</dependency-->
810+
</dependency>
813811
</dependencies>
814812
<build>
815813
<plugins>

hbase-zookeeper/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,15 @@
134134
<artifactId>reload4j</artifactId>
135135
<scope>test</scope>
136136
</dependency>
137+
<!-- ZooKeeperServer needs the below dependencies, thus MiniZooKeeperCluster also needs them -->
138+
<dependency>
139+
<groupId>org.xerial.snappy</groupId>
140+
<artifactId>snappy-java</artifactId>
141+
</dependency>
142+
<dependency>
143+
<groupId>commons-cli</groupId>
144+
<artifactId>commons-cli</artifactId>
145+
</dependency>
137146
</dependencies>
138147

139148
<build>

0 commit comments

Comments
 (0)