Revert "upgradezookeeper3.5.8"
This reverts commit 00e4e81d77153ac4017967e78c59a3b9b72e5609.
diff --git a/WORKSPACE b/WORKSPACE
index 7cf11da..41cb1db 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -66,7 +66,7 @@
name = "maven",
artifacts = [
"antlr:antlr:2.7.7",
- "org.apache.zookeeper:zookeeper:3.5.8",
+ "org.apache.zookeeper:zookeeper:3.4.14",
"io.kubernetes:client-java:" + kubernetes_client_version,
"com.esotericsoftware:kryo:3.0.3",
"org.apache.avro:avro:1.7.4",
@@ -282,8 +282,11 @@
http_archive(
name = "org_apache_zookeeper",
build_file = "@//:third_party/zookeeper/BUILD",
- strip_prefix = "apache-zookeeper-3.5.8",
- urls = ["https://archive.apache.org/dist/zookeeper/stable/apache-zookeeper-3.5.8.tar.gz"],
+ patch_args = ["-p2"],
+ patches = ["//third_party/zookeeper:pkgconfig.patch"],
+ sha256 = "b14f7a0fece8bd34c7fffa46039e563ac5367607c612517aa7bd37306afbd1cd",
+ strip_prefix = "zookeeper-3.4.14",
+ urls = ["https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz"],
)
http_archive(
diff --git a/third_party/zookeeper/BUILD b/third_party/zookeeper/BUILD
index f55b0e2..00ec56d 100644
--- a/third_party/zookeeper/BUILD
+++ b/third_party/zookeeper/BUILD
@@ -39,9 +39,7 @@
"export CFLAGS=-Wno-error",
"mkdir -p $$TMP_DIR",
"cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR",
- "cd $$TMP_DIR",
- "ant compile_jute",
- "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
+ "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c",
"autoreconf -if",
"./configure --prefix=$$INSTALL_DIR --enable-shared=no",
"make install",
diff --git a/third_party/zookeeper/pkgconfig.patch b/third_party/zookeeper/pkgconfig.patch
new file mode 100644
index 0000000..472fe6c
--- /dev/null
+++ b/third_party/zookeeper/pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -Naur /tmp/zookeeper-client/zookeeper-client-c/configure.ac /tmp/zookeeper-client/zookeeper-client-c/configure.ac
+--- /tmp/zookeeper-client/zookeeper-client-c/configure.ac 2019-03-06 16:50:47.000000000 +0000
++++ /tmp/zookeeper-client/zookeeper-client-c/configure.ac 2020-04-04 23:44:40.442252000 +0000
+@@ -34,7 +34,7 @@
+ CPPUNIT_INCLUDE=
+ CPPUNIT_LIBS=
+ else
+- AM_PATH_CPPUNIT(1.10.2)
++ PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.10.2])
+ fi
+
+ if test "$CALLER" = "ANT" ; then
