Skip to content

Commit d0e5648

Browse files
Apache9anmolnar
authored andcommitted
HBASE-28153 Upgrade zookeeper to a newer version (apache#5484) (apache#5490)
Backport of apache#5475 (cherry picked from commit 0d04a60) Signed-off-by: Andrew Purtell <apurtell@apache.org> Change-Id: Idb37274228e07afeea5518a1c79d4a053be46a05
1 parent 32f73c3 commit d0e5648

File tree

4 files changed

+99
-172
lines changed

4 files changed

+99
-172
lines changed

hbase-it/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,6 @@
151151
<groupId>io.opentelemetry</groupId>
152152
<artifactId>opentelemetry-api</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
@@ -827,13 +827,11 @@
827827
</exclusion>
828828
</exclusions>
829829
</dependency>
830-
<!-- Hadoop needs Netty 3.x at test scope for the minicluster>
831830
<dependency>
832-
<groupId>io.netty</groupId>
833-
<artifactId>netty</artifactId>
834-
<version>${netty.hadoop.version}</version>
831+
<groupId>org.apache.hadoop</groupId>
832+
<artifactId>hadoop-minikdc</artifactId>
835833
<scope>test</scope>
836-
</dependency-->
834+
</dependency>
837835
</dependencies>
838836
<build>
839837
<plugins>

hbase-zookeeper/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,15 @@
143143
<artifactId>jline</artifactId>
144144
<scope>test</scope>
145145
</dependency>
146+
<!-- ZooKeeperServer needs the below dependencies, thus MiniZooKeeperCluster also needs them -->
147+
<dependency>
148+
<groupId>org.xerial.snappy</groupId>
149+
<artifactId>snappy-java</artifactId>
150+
</dependency>
151+
<dependency>
152+
<groupId>commons-cli</groupId>
153+
<artifactId>commons-cli</artifactId>
154+
</dependency>
146155
</dependencies>
147156

148157
<build>

0 commit comments

Comments
 (0)