You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2022/05/30 23:07:44 UTC
[incubator-heron] branch nicknezis/zk-upgrade-3.8 created (now 35196c95e80)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a change to branch nicknezis/zk-upgrade-3.8
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
at 35196c95e80 Upgrade to Zookeeper 3.8.0
This branch includes the following new commits:
new 35196c95e80 Upgrade to Zookeeper 3.8.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-heron] 01/01: Upgrade to Zookeeper 3.8.0
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch nicknezis/zk-upgrade-3.8
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 35196c95e807b09fdb8e57a068b30d4e2b9ab1de
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Mon May 30 19:07:37 2022 -0400
Upgrade to Zookeeper 3.8.0
---
WORKSPACE | 8 +-
docker/base/Dockerfile.base.debian11 | 2 +-
docker/base/scripts/install-zookeeper.sh | 2 +-
docker/dist/Dockerfile.dist.centos7 | 2 +-
docker/dist/Dockerfile.dist.debian11 | 2 +-
docker/dist/Dockerfile.dist.rocky8 | 2 +-
docker/dist/Dockerfile.dist.ubuntu18.04 | 2 +-
docker/dist/Dockerfile.dist.ubuntu20.04 | 2 +-
docker/dist/Dockerfile.dist.ubuntu22.04 | 2 +-
docker/dist/scripts/install-zookeeper.sh | 2 +-
maven_install.json | 303 +++++++++++++++++++----------
third_party/zookeeper/zookeeper_jute.patch | 12 +-
12 files changed, 218 insertions(+), 123 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index f03dae798a6..5a5b893f5b1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -79,7 +79,7 @@ maven_install(
"org.slf4j:jcl-over-slf4j:%s" % slf4j_version,
"ch.qos.logback:logback-classic:%s" % logback_verison,
"antlr:antlr:2.7.7",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"io.kubernetes:client-java:" + kubernetes_client_version,
"io.kubernetes:client-java-api-fluent:" + kubernetes_client_version,
"com.esotericsoftware:kryo:5.3.0",
@@ -334,9 +334,9 @@ http_archive(
build_file = "@//:third_party/zookeeper/BUILD",
patch_args = ["-p1"],
patches = ["//third_party/zookeeper:zookeeper_jute.patch"],
- sha256 = "1c52a4ea012c12c87e49298343eae44f89ce0d61133f7e07384d5fb64f8eaa77",
- strip_prefix = "apache-zookeeper-3.6.3",
- urls = ["https://downloads.apache.org/zookeeper/zookeeper-3.6.3/apache-zookeeper-3.6.3.tar.gz"],
+ sha256 = "b0c5684640bea2d8bd6610b47ff41be2aefd6c910ba48fcad5949bd2bf2fa1ac",
+ strip_prefix = "apache-zookeeper-3.8.0",
+ urls = ["https://downloads.apache.org/zookeeper/zookeeper-3.8.0/apache-zookeeper-3.8.0.tar.gz"],
)
http_archive(
diff --git a/docker/base/Dockerfile.base.debian11 b/docker/base/Dockerfile.base.debian11
index 219ae1fb55e..24d4d15703a 100644
--- a/docker/base/Dockerfile.base.debian11
+++ b/docker/base/Dockerfile.base.debian11
@@ -28,7 +28,7 @@ RUN apt-get -y update && apt-get -y install \
rm -rf /var/lib/apt/lists/*
# install zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
ADD base/scripts /opt/heron-docker/scripts
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/base/scripts/install-zookeeper.sh b/docker/base/scripts/install-zookeeper.sh
index 4e772fbfb2d..fcd056494d4 100644
--- a/docker/base/scripts/install-zookeeper.sh
+++ b/docker/base/scripts/install-zookeeper.sh
@@ -19,7 +19,7 @@
if [ "$#" -ne 1 ]; then
echo "Usage: $0 zookeeper-<version-number>"
echo "Example:"
- echo "$ $0 zookeeper-3.5.8"
+ echo "$ $0 zookeeper-3.8.0"
exit 1
fi
diff --git a/docker/dist/Dockerfile.dist.centos7 b/docker/dist/Dockerfile.dist.centos7
index 36242c70e7e..a2e35bf2a5b 100644
--- a/docker/dist/Dockerfile.dist.centos7
+++ b/docker/dist/Dockerfile.dist.centos7
@@ -60,7 +60,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/Dockerfile.dist.debian11 b/docker/dist/Dockerfile.dist.debian11
index 6ae0cb80e10..55ed3a896db 100644
--- a/docker/dist/Dockerfile.dist.debian11
+++ b/docker/dist/Dockerfile.dist.debian11
@@ -51,7 +51,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/Dockerfile.dist.rocky8 b/docker/dist/Dockerfile.dist.rocky8
index a48c3c7a1a9..17c8d078196 100644
--- a/docker/dist/Dockerfile.dist.rocky8
+++ b/docker/dist/Dockerfile.dist.rocky8
@@ -56,7 +56,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/Dockerfile.dist.ubuntu18.04 b/docker/dist/Dockerfile.dist.ubuntu18.04
index e270f635009..49f023fa708 100644
--- a/docker/dist/Dockerfile.dist.ubuntu18.04
+++ b/docker/dist/Dockerfile.dist.ubuntu18.04
@@ -57,7 +57,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/Dockerfile.dist.ubuntu20.04 b/docker/dist/Dockerfile.dist.ubuntu20.04
index 6c8c0467fcb..6db2fc2f1dd 100644
--- a/docker/dist/Dockerfile.dist.ubuntu20.04
+++ b/docker/dist/Dockerfile.dist.ubuntu20.04
@@ -58,7 +58,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/Dockerfile.dist.ubuntu22.04 b/docker/dist/Dockerfile.dist.ubuntu22.04
index 21c034f9df2..581e1f90623 100644
--- a/docker/dist/Dockerfile.dist.ubuntu22.04
+++ b/docker/dist/Dockerfile.dist.ubuntu22.04
@@ -58,7 +58,7 @@ ENV HERON_HOME /heron/heron-core/
RUN export HERON_HOME
# install Zookeeper
-ARG ZK_DIST=zookeeper-3.5.8
+ARG ZK_DIST=zookeeper-3.8.0
RUN --mount=type=bind,source=dist,target=/opt/heron-docker/ sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST
diff --git a/docker/dist/scripts/install-zookeeper.sh b/docker/dist/scripts/install-zookeeper.sh
index a9e4cf71090..463245c10fa 100755
--- a/docker/dist/scripts/install-zookeeper.sh
+++ b/docker/dist/scripts/install-zookeeper.sh
@@ -19,7 +19,7 @@
if [ "$#" -ne 1 ]; then
echo "Usage: $0 zookeeper-<version-number>"
echo "Example:"
- echo "$ $0 zookeeper-3.5.8"
+ echo "$ $0 zookeeper-3.8.0"
exit 1
fi
diff --git a/maven_install.json b/maven_install.json
index e8388ee51e2..d3b3c53f5fe 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": -378652291,
- "__RESOLVED_ARTIFACTS_HASH": 1988458312,
+ "__INPUT_ARTIFACTS_HASH": -376808132,
+ "__RESOLVED_ARTIFACTS_HASH": -1183167186,
"conflict_resolution": {},
"dependencies": [
{
@@ -3273,10 +3273,11 @@
"io.netty:netty-common:4.1.76.Final"
],
"exclusions": [
- "org.slf4j:slf4j-jdk14",
"org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging"
+ "commons-logging:commons-logging",
+ "io.netty:netty-tcnative-classes",
+ "org.slf4j:slf4j-jdk14",
+ "log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-buffer/4.1.76.Final/netty-buffer-4.1.76.Final.jar",
"mirror_urls": [
@@ -3859,27 +3860,22 @@
},
{
"coord": "io.netty:netty-codec:4.1.76.Final",
- "dependencies": [],
- "directDependencies": [],
+ "dependencies": [
+ "io.netty:netty-buffer:4.1.76.Final",
+ "io.netty:netty-common:4.1.76.Final",
+ "io.netty:netty-resolver:4.1.76.Final",
+ "io.netty:netty-transport:4.1.76.Final"
+ ],
+ "directDependencies": [
+ "io.netty:netty-buffer:4.1.76.Final",
+ "io.netty:netty-common:4.1.76.Final",
+ "io.netty:netty-transport:4.1.76.Final"
+ ],
"exclusions": [
- "org.jboss.marshalling:jboss-marshalling",
- "com.github.luben:zstd-jni",
"org.slf4j:slf4j-log4j12",
- "com.aayushatharva.brotli4j:native-linux-x86_64",
"commons-logging:commons-logging",
- "com.aayushatharva.brotli4j:brotli4j",
- "com.aayushatharva.brotli4j:native-windows-x86_64",
- "io.netty:netty-common",
- "com.github.jponge:lzma-java",
- "com.aayushatharva.brotli4j:native-osx-x86_64",
- "com.jcraft:jzlib",
- "io.netty:netty-buffer",
- "com.google.protobuf:protobuf-java",
- "com.ning:compress-lzf",
+ "io.netty:netty-tcnative-classes",
"org.slf4j:slf4j-jdk14",
- "io.netty:netty-transport",
- "net.jpountz.lz4:lz4",
- "com.google.protobuf.nano:protobuf-javanano",
"log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-codec/4.1.76.Final/netty-codec-4.1.76.Final.jar",
@@ -3896,10 +3892,11 @@
"dependencies": [],
"directDependencies": [],
"exclusions": [
- "org.slf4j:slf4j-jdk14",
"org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging"
+ "commons-logging:commons-logging",
+ "io.netty:netty-tcnative-classes",
+ "org.slf4j:slf4j-jdk14",
+ "log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-common/4.1.76.Final/netty-common-4.1.76.Final-sources.jar",
"mirror_urls": [
@@ -3996,10 +3993,11 @@
"io.netty:netty-transport:jar:sources:4.1.76.Final"
],
"exclusions": [
- "org.slf4j:slf4j-jdk14",
"org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging"
+ "commons-logging:commons-logging",
+ "io.netty:netty-tcnative-classes",
+ "org.slf4j:slf4j-jdk14",
+ "log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-handler/4.1.76.Final/netty-handler-4.1.76.Final-sources.jar",
"mirror_urls": [
@@ -4027,10 +4025,11 @@
"io.netty:netty-transport:4.1.76.Final"
],
"exclusions": [
- "org.slf4j:slf4j-jdk14",
"org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging"
+ "commons-logging:commons-logging",
+ "io.netty:netty-tcnative-classes",
+ "org.slf4j:slf4j-jdk14",
+ "log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-handler/4.1.76.Final/netty-handler-4.1.76.Final.jar",
"mirror_urls": [
@@ -4275,6 +4274,67 @@
"sha256": "308e7e1f5faea3ff86bf689f6309b8605090cdd5186586a52e418bf48af93d68",
"url": "https://jcenter.bintray.com/io/netty/netty-tcnative-boringssl-static/2.0.31.Final/netty-tcnative-boringssl-static-2.0.31.Final.jar"
},
+ {
+ "coord": "io.netty:netty-tcnative-classes:jar:sources:2.0.48.Final",
+ "dependencies": [],
+ "directDependencies": [],
+ "exclusions": [
+ "org.slf4j:slf4j-jdk14",
+ "org.slf4j:slf4j-log4j12",
+ "log4j:log4j",
+ "commons-logging:commons-logging"
+ ],
+ "file": "v1/https/jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final-sources.jar",
+ "mirror_urls": [
+ "https://jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final-sources.jar",
+ "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final-sources.jar",
+ "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final-sources.jar"
+ ],
+ "sha256": "5e55d4c74662ec9ad49a31bb35c114d88daa6bfe23a17f9fdd4c3776eaa5f537",
+ "url": "https://jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final-sources.jar"
+ },
+ {
+ "coord": "io.netty:netty-tcnative-classes:2.0.48.Final",
+ "dependencies": [],
+ "directDependencies": [],
+ "exclusions": [
+ "org.slf4j:slf4j-jdk14",
+ "org.slf4j:slf4j-log4j12",
+ "log4j:log4j",
+ "commons-logging:commons-logging"
+ ],
+ "file": "v1/https/jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final.jar",
+ "mirror_urls": [
+ "https://jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final.jar",
+ "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final.jar",
+ "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final.jar"
+ ],
+ "sha256": "d4fd61bb23ad675ae62ed3ea2e015f548d886439b676589115d3536180c2d0d1",
+ "url": "https://jcenter.bintray.com/io/netty/netty-tcnative-classes/2.0.48.Final/netty-tcnative-classes-2.0.48.Final.jar"
+ },
+ {
+ "coord": "io.netty:netty-tcnative:2.0.48.Final",
+ "dependencies": [
+ "io.netty:netty-tcnative-classes:2.0.48.Final"
+ ],
+ "directDependencies": [
+ "io.netty:netty-tcnative-classes:2.0.48.Final"
+ ],
+ "exclusions": [
+ "org.slf4j:slf4j-jdk14",
+ "org.slf4j:slf4j-log4j12",
+ "log4j:log4j",
+ "commons-logging:commons-logging"
+ ],
+ "file": "v1/https/jcenter.bintray.com/io/netty/netty-tcnative/2.0.48.Final/netty-tcnative-2.0.48.Final.jar",
+ "mirror_urls": [
+ "https://jcenter.bintray.com/io/netty/netty-tcnative/2.0.48.Final/netty-tcnative-2.0.48.Final.jar",
+ "https://maven.google.com/io/netty/netty-tcnative/2.0.48.Final/netty-tcnative-2.0.48.Final.jar",
+ "https://repo1.maven.org/maven2/io/netty/netty-tcnative/2.0.48.Final/netty-tcnative-2.0.48.Final.jar"
+ ],
+ "sha256": "3ca1e47569d7a76cbdc4265f32ec6ab1b117e99dfbfd4891c22683ba6ab639ff",
+ "url": "https://jcenter.bintray.com/io/netty/netty-tcnative/2.0.48.Final/netty-tcnative-2.0.48.Final.jar"
+ },
{
"coord": "io.netty:netty-transport-classes-epoll:jar:sources:4.1.76.Final",
"dependencies": [
@@ -4781,10 +4841,11 @@
"io.netty:netty-resolver:jar:sources:4.1.76.Final"
],
"exclusions": [
- "org.slf4j:slf4j-jdk14",
"org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging"
+ "commons-logging:commons-logging",
+ "io.netty:netty-tcnative-classes",
+ "org.slf4j:slf4j-jdk14",
+ "log4j:log4j"
],
"file": "v1/https/jcenter.bintray.com/io/netty/netty-transport/4.1.76.Final/netty-transport-4.1.76.Final-sources.jar",
"mirror_urls": [
@@ -5858,7 +5919,7 @@
"org.apache.commons:commons-collections4:jar:sources:4.4",
"org.apache.commons:commons-lang3:jar:sources:3.12.0",
"org.apache.httpcomponents:httpclient:jar:sources:4.5.2",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:jar:sources:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.69",
"org.jctools:jctools-core:jar:sources:2.1.2",
@@ -5884,7 +5945,7 @@
"org.apache.commons:commons-collections4:jar:sources:4.4",
"org.apache.commons:commons-lang3:jar:sources:3.12.0",
"org.apache.httpcomponents:httpclient:jar:sources:4.5.2",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:jar:sources:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.69",
"org.rocksdb:rocksdbjni:jar:sources:6.10.2",
@@ -5936,7 +5997,7 @@
"org.apache.commons:commons-collections4:4.4",
"org.apache.commons:commons-lang3:3.12.0",
"org.apache.httpcomponents:httpclient:4.5.2",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:1.69",
"org.jctools:jctools-core:2.1.2",
@@ -5962,7 +6023,7 @@
"org.apache.commons:commons-collections4:4.4",
"org.apache.commons:commons-lang3:3.12.0",
"org.apache.httpcomponents:httpclient:4.5.2",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:1.69",
"org.rocksdb:rocksdbjni:6.10.2",
@@ -6499,12 +6560,12 @@
"coord": "org.apache.curator:curator-client:jar:sources:5.1.0",
"dependencies": [
"com.google.guava:guava:jar:sources:23.6-jre",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"directDependencies": [
"com.google.guava:guava:jar:sources:23.6-jre",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"exclusions": [
@@ -6526,12 +6587,12 @@
"coord": "org.apache.curator:curator-client:5.1.0",
"dependencies": [
"com.google.guava:guava:23.6-jre",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"directDependencies": [
"com.google.guava:guava:23.6-jre",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"exclusions": [
@@ -6554,7 +6615,7 @@
"dependencies": [
"com.google.guava:guava:jar:sources:23.6-jre",
"org.apache.curator:curator-client:jar:sources:5.1.0",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"directDependencies": [
@@ -6580,7 +6641,7 @@
"dependencies": [
"com.google.guava:guava:23.6-jre",
"org.apache.curator:curator-client:5.1.0",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"directDependencies": [
@@ -6607,7 +6668,7 @@
"com.google.guava:guava:jar:sources:23.6-jre",
"org.apache.curator:curator-client:jar:sources:5.1.0",
"org.apache.curator:curator-framework:jar:sources:5.1.0",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"directDependencies": [
@@ -6634,7 +6695,7 @@
"com.google.guava:guava:23.6-jre",
"org.apache.curator:curator-client:5.1.0",
"org.apache.curator:curator-framework:5.1.0",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"directDependencies": [
@@ -6786,7 +6847,7 @@
"org.apache.httpcomponents:httpclient:jar:sources:4.5.2",
"org.apache.httpcomponents:httpcore:jar:sources:4.4.4",
"org.apache.thrift:libthrift:jar:sources:0.12.0",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:jar:sources:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.69",
"org.jctools:jctools-core:jar:sources:2.1.2",
@@ -6798,7 +6859,7 @@
"org.apache.bookkeeper:bookkeeper-server:jar:sources:4.13.0",
"org.apache.distributedlog:distributedlog-protocol:jar:sources:4.13.0",
"org.apache.thrift:libthrift:jar:sources:0.12.0",
- "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"exclusions": [
@@ -6853,7 +6914,7 @@
"org.apache.httpcomponents:httpclient:4.5.2",
"org.apache.httpcomponents:httpcore:4.4.4",
"org.apache.thrift:libthrift:0.12.0",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.bouncycastle:bcpkix-jdk15on:1.69",
"org.bouncycastle:bcprov-ext-jdk15on:1.69",
"org.jctools:jctools-core:2.1.2",
@@ -6865,7 +6926,7 @@
"org.apache.bookkeeper:bookkeeper-server:4.13.0",
"org.apache.distributedlog:distributedlog-protocol:4.13.0",
"org.apache.thrift:libthrift:0.12.0",
- "org.apache.zookeeper:zookeeper:3.6.3",
+ "org.apache.zookeeper:zookeeper:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"exclusions": [
@@ -8117,7 +8178,7 @@
"url": "https://jcenter.bintray.com/org/apache/thrift/libthrift/0.12.0/libthrift-0.12.0.jar"
},
{
- "coord": "org.apache.yetus:audience-annotations:jar:sources:0.5.0",
+ "coord": "org.apache.yetus:audience-annotations:jar:sources:0.12.0",
"dependencies": [],
"directDependencies": [],
"exclusions": [
@@ -8126,17 +8187,17 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0-sources.jar",
- "https://maven.google.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0-sources.jar",
- "https://repo1.maven.org/maven2/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0-sources.jar"
+ "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0-sources.jar",
+ "https://maven.google.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0-sources.jar",
+ "https://repo1.maven.org/maven2/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0-sources.jar"
],
- "sha256": "05d975529ac0d51ffd6c38376d59c29f79fca2f5c6bef76e096223c52d26928b",
- "url": "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0-sources.jar"
+ "sha256": "9de7dc79df25d57a72685dd47fb34e26b7e720cb7f5fe22f24d7403eb5bc06f8",
+ "url": "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0-sources.jar"
},
{
- "coord": "org.apache.yetus:audience-annotations:0.5.0",
+ "coord": "org.apache.yetus:audience-annotations:0.12.0",
"dependencies": [],
"directDependencies": [],
"exclusions": [
@@ -8145,22 +8206,22 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0.jar",
- "https://maven.google.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0.jar",
- "https://repo1.maven.org/maven2/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0.jar"
+ "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0.jar",
+ "https://maven.google.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0.jar",
+ "https://repo1.maven.org/maven2/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0.jar"
],
- "sha256": "c82631f06c75d46bf6524d95f0d6c2e3aef1b3eb4a7b584ca296624ef0d474be",
- "url": "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.5.0/audience-annotations-0.5.0.jar"
+ "sha256": "ffb101fc066360ff3c77457c927fd7967fb096a6ee9e046ab7071447d8208efc",
+ "url": "https://jcenter.bintray.com/org/apache/yetus/audience-annotations/0.12.0/audience-annotations-0.12.0.jar"
},
{
- "coord": "org.apache.zookeeper:zookeeper-jute:jar:sources:3.6.3",
+ "coord": "org.apache.zookeeper:zookeeper-jute:jar:sources:3.8.0",
"dependencies": [
- "org.apache.yetus:audience-annotations:jar:sources:0.5.0"
+ "org.apache.yetus:audience-annotations:jar:sources:0.12.0"
],
"directDependencies": [
- "org.apache.yetus:audience-annotations:jar:sources:0.5.0"
+ "org.apache.yetus:audience-annotations:jar:sources:0.12.0"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -8168,22 +8229,22 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3-sources.jar",
- "https://maven.google.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3-sources.jar",
- "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3-sources.jar"
+ "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0-sources.jar",
+ "https://maven.google.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0-sources.jar",
+ "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0-sources.jar"
],
- "sha256": "b99a8ef4d9d3998ecb2c038c2ffce9ea067b55e38f9419bcf6c3ae7ceae15388",
- "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3-sources.jar"
+ "sha256": "f6b517e005ba3c50c52debf0c7a4b0509d55738e5588a293088d4eded15f1c16",
+ "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0-sources.jar"
},
{
- "coord": "org.apache.zookeeper:zookeeper-jute:3.6.3",
+ "coord": "org.apache.zookeeper:zookeeper-jute:3.8.0",
"dependencies": [
- "org.apache.yetus:audience-annotations:0.5.0"
+ "org.apache.yetus:audience-annotations:0.12.0"
],
"directDependencies": [
- "org.apache.yetus:audience-annotations:0.5.0"
+ "org.apache.yetus:audience-annotations:0.12.0"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -8191,29 +8252,38 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3.jar",
- "https://maven.google.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3.jar",
- "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3.jar"
+ "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0.jar",
+ "https://maven.google.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0.jar",
+ "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0.jar"
],
- "sha256": "6f463ade2b777f81e6c3e145b3fc03d4b39131b73dcf8c7f4b89ac4b1bacc9c5",
- "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.6.3/zookeeper-jute-3.6.3.jar"
+ "sha256": "2e390ceb0f128c519f2e0effa4d109102127517af9f11c5bb3f3f492b1dca9e1",
+ "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper-jute/3.8.0/zookeeper-jute-3.8.0.jar"
},
{
- "coord": "org.apache.zookeeper:zookeeper:jar:sources:3.6.3",
+ "coord": "org.apache.zookeeper:zookeeper:jar:sources:3.8.0",
"dependencies": [
+ "ch.qos.logback:logback-classic:jar:sources:1.2.11",
+ "ch.qos.logback:logback-core:jar:sources:1.2.11",
+ "commons-io:commons-io:jar:sources:2.4",
"io.netty:netty-handler:jar:sources:4.1.76.Final",
+ "io.netty:netty-tcnative-classes:jar:sources:2.0.48.Final",
+ "io.netty:netty-tcnative:jar:sources:2.0.48.Final",
"io.netty:netty-transport-native-epoll:jar:sources:4.1.76.Final",
- "org.apache.yetus:audience-annotations:jar:sources:0.5.0",
- "org.apache.zookeeper:zookeeper-jute:jar:sources:3.6.3",
+ "org.apache.yetus:audience-annotations:jar:sources:0.12.0",
+ "org.apache.zookeeper:zookeeper-jute:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"directDependencies": [
+ "ch.qos.logback:logback-classic:jar:sources:1.2.11",
+ "ch.qos.logback:logback-core:jar:sources:1.2.11",
+ "commons-io:commons-io:jar:sources:2.4",
"io.netty:netty-handler:jar:sources:4.1.76.Final",
+ "io.netty:netty-tcnative:jar:sources:2.0.48.Final",
"io.netty:netty-transport-native-epoll:jar:sources:4.1.76.Final",
- "org.apache.yetus:audience-annotations:jar:sources:0.5.0",
- "org.apache.zookeeper:zookeeper-jute:jar:sources:3.6.3",
+ "org.apache.yetus:audience-annotations:jar:sources:0.12.0",
+ "org.apache.zookeeper:zookeeper-jute:jar:sources:3.8.0",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"exclusions": [
@@ -8222,29 +8292,38 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3-sources.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0-sources.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3-sources.jar",
- "https://maven.google.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3-sources.jar",
- "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3-sources.jar"
+ "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0-sources.jar",
+ "https://maven.google.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0-sources.jar",
+ "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0-sources.jar"
],
- "sha256": "c249081f34f022f4fefb4a3bd83de768af7966ffc6a81070f3f9187242af574f",
- "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3-sources.jar"
+ "sha256": "73d91aceeea4e06e3059f1f31fd57b54ce13c590473956dbd7386b3684f92b09",
+ "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0-sources.jar"
},
{
- "coord": "org.apache.zookeeper:zookeeper:3.6.3",
+ "coord": "org.apache.zookeeper:zookeeper:3.8.0",
"dependencies": [
+ "ch.qos.logback:logback-classic:1.2.11",
+ "ch.qos.logback:logback-core:1.2.11",
+ "commons-io:commons-io:2.4",
"io.netty:netty-handler:4.1.76.Final",
+ "io.netty:netty-tcnative-classes:2.0.48.Final",
+ "io.netty:netty-tcnative:2.0.48.Final",
"io.netty:netty-transport-native-epoll:4.1.76.Final",
- "org.apache.yetus:audience-annotations:0.5.0",
- "org.apache.zookeeper:zookeeper-jute:3.6.3",
+ "org.apache.yetus:audience-annotations:0.12.0",
+ "org.apache.zookeeper:zookeeper-jute:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"directDependencies": [
+ "ch.qos.logback:logback-classic:1.2.11",
+ "ch.qos.logback:logback-core:1.2.11",
+ "commons-io:commons-io:2.4",
"io.netty:netty-handler:4.1.76.Final",
+ "io.netty:netty-tcnative:2.0.48.Final",
"io.netty:netty-transport-native-epoll:4.1.76.Final",
- "org.apache.yetus:audience-annotations:0.5.0",
- "org.apache.zookeeper:zookeeper-jute:3.6.3",
+ "org.apache.yetus:audience-annotations:0.12.0",
+ "org.apache.zookeeper:zookeeper-jute:3.8.0",
"org.slf4j:slf4j-api:1.7.36"
],
"exclusions": [
@@ -8253,14 +8332,14 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3.jar",
+ "file": "v1/https/jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0.jar",
"mirror_urls": [
- "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3.jar",
- "https://maven.google.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3.jar",
- "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3.jar"
+ "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0.jar",
+ "https://maven.google.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0.jar",
+ "https://repo1.maven.org/maven2/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0.jar"
],
- "sha256": "ac44de96d37a80d463c1e01aaa2ea86b19490fa17a37438d14491456c0e4a911",
- "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.6.3/zookeeper-3.6.3.jar"
+ "sha256": "5a6591c242acbd3cb04eb4afc6d218664c9708b5b7174535b1ed68e44346e55c",
+ "url": "https://jcenter.bintray.com/org/apache/zookeeper/zookeeper/3.8.0/zookeeper-3.8.0.jar"
},
{
"coord": "org.asynchttpclient:async-http-client-netty-utils:jar:sources:2.0.31",
@@ -12209,6 +12288,22 @@
],
"file": null
},
+ {
+ "coord": "io.netty:netty-tcnative:jar:sources:2.0.48.Final",
+ "dependencies": [
+ "io.netty:netty-tcnative-classes:jar:sources:2.0.48.Final"
+ ],
+ "directDependencies": [
+ "io.netty:netty-tcnative-classes:jar:sources:2.0.48.Final"
+ ],
+ "exclusions": [
+ "org.slf4j:slf4j-jdk14",
+ "org.slf4j:slf4j-log4j12",
+ "log4j:log4j",
+ "commons-logging:commons-logging"
+ ],
+ "file": null
+ },
{
"coord": "net.sf.kosmosfs:kfs:jar:sources:0.3",
"dependencies": [],
diff --git a/third_party/zookeeper/zookeeper_jute.patch b/third_party/zookeeper/zookeeper_jute.patch
index 010a117ab15..2fdb2c3a61c 100644
--- a/third_party/zookeeper/zookeeper_jute.patch
+++ b/third_party/zookeeper/zookeeper_jute.patch
@@ -1,6 +1,6 @@
-diff -urN apache-zookeeper-3.6.3.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c apache-zookeeper-3.6.3.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c
---- apache-zookeeper-3.6.3.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c 1970-01-01 00:00:00.000000000 +0000
-+++ apache-zookeeper-3.6.3.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c 2021-04-18 05:41:30.643935033 +0000
+diff -urN apache-zookeeper-3.8.0.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c apache-zookeeper-3.8.0.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c
+--- apache-zookeeper-3.8.0.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c 1970-01-01 00:00:00.000000000 +0000
++++ apache-zookeeper-3.8.0.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.c 2021-04-18 05:41:30.643935033 +0000
@@ -0,0 +1,1622 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
@@ -1624,9 +1624,9 @@ diff -urN apache-zookeeper-3.6.3.orig/zookeeper-client/zookeeper-client-c/genera
+void deallocate_MultiTxn(struct MultiTxn*v){
+ deallocate_Txn_vector(&v->txns);
+}
-diff -urN apache-zookeeper-3.6.3.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h apache-zookeeper-3.6.3.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h
---- apache-zookeeper-3.6.3.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h 1970-01-01 00:00:00.000000000 +0000
-+++ apache-zookeeper-3.6.3.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h 2021-04-18 05:41:30.647076266 +0000
+diff -urN apache-zookeeper-3.8.0.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h apache-zookeeper-3.8.0.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h
+--- apache-zookeeper-3.8.0.orig/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h 1970-01-01 00:00:00.000000000 +0000
++++ apache-zookeeper-3.8.0.desired/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h 2021-04-18 05:41:30.647076266 +0000
@@ -0,0 +1,595 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one