This is an automated email from the ASF dual-hosted git repository. huijun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push: new 00e4e81 upgradezookeeper3.5.8 00e4e81 is described below commit 00e4e81d77153ac4017967e78c59a3b9b72e5609 Author: huijunwu <huijun.wu.2...@gmail.com> AuthorDate: Fri Jul 3 02:01:31 2020 +0000 upgradezookeeper3.5.8 --- WORKSPACE | 9 +++------ third_party/zookeeper/BUILD | 4 +++- third_party/zookeeper/pkgconfig.patch | 12 ------------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 41cb1db..7cf11da 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -66,7 +66,7 @@ maven_install( name = "maven", artifacts = [ "antlr:antlr:2.7.7", - "org.apache.zookeeper:zookeeper:3.4.14", + "org.apache.zookeeper:zookeeper:3.5.8", "io.kubernetes:client-java:" + kubernetes_client_version, "com.esotericsoftware:kryo:3.0.3", "org.apache.avro:avro:1.7.4", @@ -282,11 +282,8 @@ http_archive( http_archive( name = "org_apache_zookeeper", build_file = "@//:third_party/zookeeper/BUILD", - 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"], + strip_prefix = "apache-zookeeper-3.5.8", + urls = ["https://archive.apache.org/dist/zookeeper/stable/apache-zookeeper-3.5.8.tar.gz"], ) http_archive( diff --git a/third_party/zookeeper/BUILD b/third_party/zookeeper/BUILD index 00ec56d..f55b0e2 100644 --- a/third_party/zookeeper/BUILD +++ b/third_party/zookeeper/BUILD @@ -39,7 +39,9 @@ genrule( "export CFLAGS=-Wno-error", "mkdir -p $$TMP_DIR", "cp -R $$(pwd)/external/org_apache_zookeeper/* $$TMP_DIR", - "cd $$TMP_DIR/zookeeper-client/zookeeper-client-c", + "cd $$TMP_DIR", + "ant compile_jute", + "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 deleted file mode 100644 index 472fe6c..0000000 --- a/third_party/zookeeper/pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -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