From 40fc0f4742a3923ee437e8843824d424a9906ab7 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Thu, 19 Oct 2023 08:54:33 +0300
Subject: [PATCH] Upgrade Zookeeper to 3.8.3 to address CVE-2023-44981

---
 bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt    | 6 +++---
 bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt  | 6 +++---
 bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 6 +++---
 pom.xml                                                   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index 6bfac1d6ef5..687012cd666 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -260,9 +260,9 @@ Apache Software License, Version 2.
 - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
 - lib/org.apache.commons-commons-collections4-4.1.jar [19]
 - lib/org.apache.commons-commons-lang3-3.6.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.1.jar [21]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21]
-- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21]
 - lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22]
 - lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22]
 - lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 392b43778ad..7bf37be13fb 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -245,9 +245,9 @@ Apache Software License, Version 2.
 - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16]
 - 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.8.1.jar [20]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [20]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [20]
+- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [20]
 - lib/com.beust-jcommander-1.82.jar [23]
 - lib/net.jpountz.lz4-lz4-1.3.0.jar [25]
 - lib/com.google.api.grpc-proto-google-common-protos-2.17.0.jar [27]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index f168f623ef3..4a128ba6bd0 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -260,9 +260,9 @@ Apache Software License, Version 2.
 - lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
 - lib/org.apache.commons-commons-collections4-4.1.jar [19]
 - lib/org.apache.commons-commons-lang3-3.6.jar [20]
-- lib/org.apache.zookeeper-zookeeper-3.8.1.jar [21]
-- lib/org.apache.zookeeper-zookeeper-jute-3.8.1.jar [21]
-- lib/org.apache.zookeeper-zookeeper-3.8.1-tests.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.3.jar [21]
+- lib/org.apache.zookeeper-zookeeper-jute-3.8.3.jar [21]
+- lib/org.apache.zookeeper-zookeeper-3.8.3-tests.jar [21]
 - lib/org.eclipse.jetty-jetty-http-9.4.51.v20230217.jar [22]
 - lib/org.eclipse.jetty-jetty-io-9.4.51.v20230217.jar [22]
 - lib/org.eclipse.jetty-jetty-security-9.4.51.v20230217.jar [22]
diff --git a/pom.xml b/pom.xml
index 6938b329839..4eccf7f9da4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
     <javax-annotations-api.version>1.3.2</javax-annotations-api.version>
     <testcontainers.version>1.17.6</testcontainers.version>
     <vertx.version>4.3.8</vertx.version>
-    <zookeeper.version>3.8.1</zookeeper.version>
+    <zookeeper.version>3.8.3</zookeeper.version>
     <snappy.version>1.1.10.1</snappy.version>
     <jctools.version>2.1.2</jctools.version>
     <hppc.version>0.9.1</hppc.version>