From e76f20ceff8bdda278cdb0ac107261d27e057430 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:48:37 +0300
Subject: [PATCH] [fix][sec] Upgrade Zookeeper to 3.8.3 to address
 CVE-2023-44981 (#21398)

(cherry picked from commit e5120ec68907525177f5add5c95b022f3106da1a)
---
 distribution/server/src/assemble/LICENSE.bin.txt | 6 +++---
 pom.xml                                          | 2 +-
 pulsar-sql/presto-distribution/LICENSE           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index c4b06a882623d..37a62a0691151 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -528,9 +528,9 @@ The Apache Software License, Version 2.0
     - io.vertx-vertx-web-3.9.8.jar
     - io.vertx-vertx-web-common-3.9.8.jar
   * Apache ZooKeeper
-    - org.apache.zookeeper-zookeeper-3.8.1.jar
-    - org.apache.zookeeper-zookeeper-jute-3.8.1.jar
-    - org.apache.zookeeper-zookeeper-prometheus-metrics-3.8.1.jar
+    - org.apache.zookeeper-zookeeper-3.8.3.jar
+    - org.apache.zookeeper-zookeeper-jute-3.8.3.jar
+    - org.apache.zookeeper-zookeeper-prometheus-metrics-3.8.3.jar
   * Snappy Java
     - org.xerial.snappy-snappy-java-1.1.10.1.jar
   * Google HTTP Client
diff --git a/pom.xml b/pom.xml
index 0faf53ecc856f..8b09ebbc94620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@ flexible messaging model and an intuitive client API.</description>
     <commons-compress.version>1.21</commons-compress.version>
 
     <bookkeeper.version>4.15.4</bookkeeper.version>
-    <zookeeper.version>3.8.1</zookeeper.version>
+    <zookeeper.version>3.8.3</zookeeper.version>
     <commons-cli.version>1.5.0</commons-cli.version>
     <commons-text.version>1.10.0</commons-text.version>
     <snappy.version>1.1.10.1</snappy.version> <!-- ZooKeeper server -->
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index d1ab7ed196c35..b67249d0ea5ae 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -479,8 +479,8 @@ The Apache Software License, Version 2.0
     - memory-0.8.3.jar
     - sketches-core-0.8.3.jar
   * Apache Zookeeper
-    - zookeeper-3.8.1.jar
-    - zookeeper-jute-3.8.1.jar
+    - zookeeper-3.8.3.jar
+    - zookeeper-jute-3.8.3.jar
   * Apache Yetus Audience Annotations
     - audience-annotations-0.12.0.jar
   * Swagger