Issue #2106: Update ZookKeeper dependency to 3.5.7
Descriptions of the changes in this PR:
Updated ZooKeeper dependency from 3.4.13 to 3.5.7
Excluded transitive dependency to netty-all.
Updated maven-shade-pluging configuration in 'distributedlog-core-shaded' project. Package 'org.apache.jute' was moved to a ZooKeeper dependency (org.apache.zookeeper:zookeeper-jute), so i added the artifact to the artifactSet.
Updated license files:
- updated Zookeeper to 3.5.7
- removed Jline 2.11
- removed Netty 3.10.1
- added Zookeeper-jute 3.5.7
Master Issue: #2106
Reviewers: Matteo Minardi <minardi.matteo@hotmail.it>, Enrico Olivelli <eolivelli@gmail.com>, Jia Zhai <zhaijia@apache.org>
This closes #2112 from dmercuriali/fix/#2106-update-zookeeper, closes #2106
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index a13d26c..565d731 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -244,7 +244,8 @@
- lib/net.java.dev.jna-jna-3.2.7.jar [22]
- lib/org.apache.commons-commons-collections4-4.1.jar [23]
- lib/org.apache.commons-commons-lang3-3.6.jar [24]
-- lib/org.apache.zookeeper-zookeeper-3.4.13.jar [25]
+- lib/org.apache.zookeeper-zookeeper-3.5.7.jar [25]
+- lib/org.apache.zookeeper-zookeeper-jute-3.5.7.jar [25]
- lib/org.eclipse.jetty-jetty-http-9.4.5.v20170502.jar [26]
- lib/org.eclipse.jetty-jetty-io-9.4.5.v20170502.jar [26]
- lib/org.eclipse.jetty-jetty-security-9.4.5.v20170502.jar [26]
@@ -307,7 +308,7 @@
[22] Source available at https://github.com/java-native-access/jna/tree/3.2.7
[23] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-collections.git;a=tag;h=a3a5ad
[24] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=tag;h=3ad2e8
-[25] Source available at https://github.com/apache/zookeeper/tree/release-3.4.13
+[25] Source available at https://github.com/apache/zookeeper/tree/release-3.5.7
[26] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.5.v20170502
[27] Source available at https://github.com/facebook/rocksdb/tree/v5.13.1
[28] Source available at https://github.com/cbeust/jcommander/tree/jcommander-1.48
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 8abca03..da4d619 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -232,7 +232,8 @@
- lib/net.java.dev.jna-jna-3.2.7.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [18]
- lib/org.apache.commons-commons-lang3-3.6.jar [19]
-- lib/org.apache.zookeeper-zookeeper-3.4.13.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.5.7.jar [20]
+- lib/org.apache.zookeeper-zookeeper-jute-3.5.7.jar [20]
- lib/com.beust-jcommander-1.48.jar [23]
- lib/net.jpountz.lz4-lz4-1.3.0.jar [25]
- lib/com.google.api.grpc-proto-google-common-protos-1.12.0.jar [27]
@@ -278,7 +279,7 @@
[17] Source available at https://github.com/java-native-access/jna/tree/3.2.7
[18] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-collections.git;a=tag;h=a3a5ad
[19] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6
-[20] Source available at https://github.com/apache/zookeeper/tree/release-3.4.13
+[20] Source available at https://github.com/apache/zookeeper/tree/release-3.5.7
[23] Source available at https://github.com/cbeust/jcommander/tree/jcommander-1.48
[25] Source available at https://github.com/lz4/lz4-java/tree/1.3.0
[27] Source available at https://github.com/googleapis/googleapis
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 912f730..206dd88 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -241,7 +241,8 @@
- lib/net.java.dev.jna-jna-3.2.7.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [18]
- lib/org.apache.commons-commons-lang3-3.6.jar [19]
-- lib/org.apache.zookeeper-zookeeper-3.4.13.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.5.7.jar [20]
+- lib/org.apache.zookeeper-zookeeper-jute-3.5.7.jar [20]
- lib/org.eclipse.jetty-jetty-http-9.4.5.v20170502.jar [21]
- lib/org.eclipse.jetty-jetty-io-9.4.5.v20170502.jar [21]
- lib/org.eclipse.jetty-jetty-security-9.4.5.v20170502.jar [21]
@@ -302,7 +303,7 @@
[17] Source available at https://github.com/java-native-access/jna/tree/3.2.7
[18] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-collections.git;a=tag;h=a3a5ad
[19] Source available at https://git-wip-us.apache.org/repos/asf?p=commons-lang.git;a=shortlog;h=refs/tags/LANG_3_6
-[20] Source available at https://github.com/apache/zookeeper/tree/release-3.4.13
+[20] Source available at https://github.com/apache/zookeeper/tree/release-3.5.7
[21] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.5.v20170502
[22] Source available at https://github.com/facebook/rocksdb/tree/v5.13.1
[23] Source available at https://github.com/cbeust/jcommander/tree/jcommander-1.48
diff --git a/pom.xml b/pom.xml
index 0a9391a..efd595d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
<javax-annotations-api.version>1.3.2</javax-annotations-api.version>
<testcontainers.version>1.8.3</testcontainers.version>
<vertx.version>3.4.1</vertx.version>
- <zookeeper.version>3.4.13</zookeeper.version>
+ <zookeeper.version>3.5.7</zookeeper.version>
<jctools.version>2.1.2</jctools.version>
<!-- plugin dependencies -->
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
@@ -499,7 +499,7 @@
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -523,7 +523,7 @@
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/shaded/distributedlog-core-shaded/pom.xml b/shaded/distributedlog-core-shaded/pom.xml
index 3d763a9..810014f 100644
--- a/shaded/distributedlog-core-shaded/pom.xml
+++ b/shaded/distributedlog-core-shaded/pom.xml
@@ -82,8 +82,6 @@
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>com.google.guava:guava</include>
<include>com.google.protobuf:protobuf-java</include>
- <!-- netty 3 (included from zookeeper) -->
- <include>io.netty:netty</include>
<include>net.java.dev.jna:jna</include>
<include>net.jpountz.lz4:lz4</include>
<include>org.apache.bookkeeper:bookkeeper-common</include>
@@ -104,6 +102,7 @@
<include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.thrift:libthrift</include>
<include>org.apache.zookeeper:zookeeper</include>
+ <include>org.apache.zookeeper:zookeeper-jute</include>
<include>org.rocksdb:rocksdbjni</include>
</includes>
</artifactSet>
diff --git a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
index fd9e4a7..0b7c46a 100644
--- a/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
+++ b/tests/integration-tests-topologies/src/main/java/org/apache/bookkeeper/tests/containers/ZKContainer.java
@@ -22,7 +22,7 @@
import java.time.Duration;
import lombok.extern.slf4j.Slf4j;
-import org.apache.bookkeeper.tests.containers.wait.ZKWaitStrategy;
+import org.apache.bookkeeper.tests.containers.wait.HttpWaitStrategy;
/**
* Test container that runs zookeeper.
@@ -62,7 +62,10 @@
@Override
public void start() {
- this.waitStrategy = new ZKWaitStrategy(ZK_PORT)
+ this.waitStrategy = new HttpWaitStrategy()
+ .forPath("/commands/ruok")
+ .forStatusCode(200)
+ .forPort(ZK_HTTP_PORT)
.withStartupTimeout(Duration.of(60, SECONDS));
this.withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withHostName(HOST_NAME));
