From 4e67adaf49f53a218dda45f9d3a41210b5bdfbaf Mon Sep 17 00:00:00 2001
From: bitani <bitani@murex.com>
Date: Fri, 12 Jun 2026 15:41:19 +0300
Subject: [PATCH 1/2] ZOOKEEPER-5056: Upgrade Netty to address CVE
 vulnerabilities

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2811e0dfa06..730aa0959f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -559,7 +559,7 @@
     <mockito.version>4.9.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.130.Final</netty.version>
+    <netty.version>4.1.135.Final</netty.version>
     <jetty.version>9.4.58.v20250814</jetty.version>
     <jackson.version>2.18.1</jackson.version>
     <jline.version>3.25.1</jline.version>

From b9665825c62fd935422a5ace262250fec8cfe6af Mon Sep 17 00:00:00 2001
From: bitani <bitani@murex.com>
Date: Wed, 24 Jun 2026 16:06:22 +0300
Subject: [PATCH 2/2] ZOOKEEPER-5056: Update Netty license

---
 ...0.Final.LICENSE.txt => netty-buffer-4.1.135.Final.LICENSE.txt} | 0
 ...30.Final.LICENSE.txt => netty-codec-4.1.135.Final.LICENSE.txt} | 0
 ...0.Final.LICENSE.txt => netty-common-4.1.135.Final.LICENSE.txt} | 0
 ....Final.LICENSE.txt => netty-handler-4.1.135.Final.LICENSE.txt} | 0
 ...Final.LICENSE.txt => netty-resolver-4.1.135.Final.LICENSE.txt} | 0
 ...inal.LICENSE.txt => netty-transport-4.1.135.Final.LICENSE.txt} | 0
 ...xt => netty-transport-classes-epoll-4.1.135.Final.LICENSE.txt} | 0
 ... netty-transport-native-unix-common-4.1.135.Final.LICENSE.txt} | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename zookeeper-server/src/main/resources/lib/{netty-buffer-4.1.130.Final.LICENSE.txt => netty-buffer-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-codec-4.1.130.Final.LICENSE.txt => netty-codec-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-common-4.1.130.Final.LICENSE.txt => netty-common-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-handler-4.1.130.Final.LICENSE.txt => netty-handler-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-resolver-4.1.130.Final.LICENSE.txt => netty-resolver-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-4.1.130.Final.LICENSE.txt => netty-transport-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-classes-epoll-4.1.130.Final.LICENSE.txt => netty-transport-classes-epoll-4.1.135.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-native-unix-common-4.1.130.Final.LICENSE.txt => netty-transport-native-unix-common-4.1.135.Final.LICENSE.txt} (100%)

diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-buffer-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-codec-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-common-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-common-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-handler-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-resolver-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.135.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.130.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.135.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.130.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.135.Final.LICENSE.txt