From 92b648b01ff359e337aa07ba5ca6327c00e076e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:49:35 +0000
Subject: [PATCH 1/5] Bump org.apache.zookeeper:zookeeper from 3.5.9 to 3.8.4

Bumps org.apache.zookeeper:zookeeper from 3.5.9 to 3.8.4.

---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2f18f6540..a093de7d6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
   <properties>
     <revision>1.6.0</revision>
 
-    <zookeeper.version>3.5.9</zookeeper.version>
+    <zookeeper.version>3.8.4</zookeeper.version>
     <curator.version>4.2.0</curator.version>
     <hadoop.version>3.3.4</hadoop.version>
     <hadoop-hdfs-client.artifact>hadoop-hdfs-client</hadoop-hdfs-client.artifact>

From 331606560e0010a990156b52e6fa294b4fa9d309 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:11:29 +0100
Subject: [PATCH 2/5] Update known-dependencies.txt

---
 tool/dependencies/known-dependencies.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 441a3a8fae..2de4f7348a 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -802,7 +802,7 @@ zipkin-2.23.2.jar
 zipkin-reporter-2.16.3.jar
 zipkin-reporter-brave-2.16.3.jar
 zjsonpatch-0.3.0.jar
-zookeeper-3.5.9.jar
-zookeeper-jute-3.5.9.jar
+zookeeper-3.8.4.jar
+zookeeper-jute-3.8.4.jar
 zstd-jni-1.4.5-6.jar
 zstd-jni-1.5.0-4.jar

From 88130d69ebe4e658e197efc9bcde2405bbcb4096 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:24:42 +0100
Subject: [PATCH 3/5] use v3.9.3 due to ZOOKEEPER-4820

---
 pom.xml                                  | 2 +-
 tool/dependencies/known-dependencies.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a093de7d6e..52e311f585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
   <properties>
     <revision>1.6.0</revision>
 
-    <zookeeper.version>3.8.4</zookeeper.version>
+    <zookeeper.version>3.9.3</zookeeper.version>
     <curator.version>4.2.0</curator.version>
     <hadoop.version>3.3.4</hadoop.version>
     <hadoop-hdfs-client.artifact>hadoop-hdfs-client</hadoop-hdfs-client.artifact>
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 2de4f7348a..39972621cc 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -802,7 +802,7 @@ zipkin-2.23.2.jar
 zipkin-reporter-2.16.3.jar
 zipkin-reporter-brave-2.16.3.jar
 zjsonpatch-0.3.0.jar
-zookeeper-3.8.4.jar
-zookeeper-jute-3.8.4.jar
+zookeeper-3.9.3.jar
+zookeeper-jute-3.9.3.jar
 zstd-jni-1.4.5-6.jar
 zstd-jni-1.5.0-4.jar

From 37cc6ef2fd5da9edfabfd21686d834630a32cd86 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:31:54 +0100
Subject: [PATCH 4/5] need to avoid zookeeper logback dependency

---
 pom.xml                                  | 10 +++++++++-
 tool/dependencies/known-dependencies.txt |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52e311f585..9c928bd540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
   <properties>
     <revision>1.6.0</revision>
 
-    <zookeeper.version>3.9.3</zookeeper.version>
+    <zookeeper.version>3.9.2</zookeeper.version>
     <curator.version>4.2.0</curator.version>
     <hadoop.version>3.3.4</hadoop.version>
     <hadoop-hdfs-client.artifact>hadoop-hdfs-client</hadoop-hdfs-client.artifact>
@@ -1191,6 +1191,14 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 39972621cc..8f72c81bae 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -802,7 +802,7 @@ zipkin-2.23.2.jar
 zipkin-reporter-2.16.3.jar
 zipkin-reporter-brave-2.16.3.jar
 zjsonpatch-0.3.0.jar
-zookeeper-3.9.3.jar
-zookeeper-jute-3.9.3.jar
+zookeeper-3.9.2.jar
+zookeeper-jute-3.9.2.jar
 zstd-jni-1.4.5-6.jar
 zstd-jni-1.5.0-4.jar

From beeb14e673e1768e81d329cd03aab300c957eb2a Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:15:44 +0100
Subject: [PATCH 5/5] Update known-dependencies.txt

---
 tool/dependencies/known-dependencies.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 8f72c81bae..c4e8305652 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -35,6 +35,7 @@ asm-analysis-9.3.jar
 asm-commons-9.3.jar
 asm-tree-9.3.jar
 aspectjweaver-1.9.7.jar
+audience-annotations-0.12.0.jar
 audience-annotations-0.13.0.jar
 audience-annotations-0.5.0.jar
 automaton-1.11-8.jar
@@ -596,6 +597,13 @@ netty-resolver-dns-4.1.86.Final.jar
 netty-resolver-dns-classes-macos-4.1.86.Final.jar
 netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar
 netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
+netty-tcnative-boringssl-static-2.0.54.Final.jar
+netty-tcnative-classes-2.0.54.Final.jar
 netty-transport-4.1.86.Final.jar
 netty-transport-classes-epoll-4.1.86.Final.jar
 netty-transport-classes-kqueue-4.1.86.Final.jar