From c6edf2d9f8226eed8c27be42b555278cf88db55b Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Sat, 15 Feb 2020 05:04:26 -0800
Subject: [PATCH] Upgrade ZooKeeper to 3.5.7 (#6329)

Upgrade ZK to latest stable version. In particular we need to include:

- Split brain on log disk full https://issues.apache.org/jira/browse/ZOOKEEPER-3701
- Data loss after upgrading standalone ZK server 3.4.14 to 3.5.6 with snapshot.trust.empty=true https://issues.apache.org/jira/browse/ZOOKEEPER-3644
(cherry picked from commit 5a8f420d06aad8cbeabe17455c3cce615cfe679c)
---
 distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
 pom.xml                                          | 2 +-
 pulsar-sql/presto-distribution/LICENSE           | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index c3dc98290a31e..a817987f0006b 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -497,7 +497,7 @@ The Apache Software License, Version 2.0
     - io.vertx-vertx-core-3.4.1.jar
     - io.vertx-vertx-web-3.4.1.jar
   * Apache ZooKeeper
-    - org.apache.zookeeper-zookeeper-jute-3.5.6.jar
+    - org.apache.zookeeper-zookeeper-jute-3.5.7.jar
 
 BSD 3-clause "New" or "Revised" License
  * Google auth library
diff --git a/pom.xml b/pom.xml
index e06c25891dfdf..89336f5cc0ab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@ flexible messaging model and an intuitive client API.</description>
     <commons-compress.version>1.19</commons-compress.version>
 
     <bookkeeper.version>4.10.0</bookkeeper.version>
-    <zookeeper.version>3.5.6</zookeeper.version>
+    <zookeeper.version>3.5.7</zookeeper.version>
     <netty.version>4.1.43.Final</netty.version>
     <netty-tc-native.version>2.0.26.Final</netty-tc-native.version>
     <storm.version>2.0.0</storm.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 1e8971a167865..a8e18cd7da26e 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -447,8 +446,8 @@ The Apache Software License, Version 2.0
     - memory-0.8.3.jar
     - sketches-core-0.8.3.jar
   * Apache Zookeeper
-    - zookeeper-3.5.6.jar
-    - zookeeper-jute-3.5.6.jar 
+    - zookeeper-3.5.7.jar
+    - zookeeper-jute-3.5.7.jar
   * Apache Yetus Audience Annotations
     - audience-annotations-0.5.0.jar
   * Swagger