From d44bddf1de099d2ce10defe2aa1d88f1c0309e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Paksy?= <paksydavid@gmail.com>
Date: Wed, 2 Sep 2026 14:40:24 +0200
Subject: [PATCH] ZOOKEEPER-5086: Upgrade Netty to 4.1.137.Final

to fix CVE-2026-62380.
Also renames the corresponding LICENSE files under zookeeper-server/src/main/resources/lib/.
---
 pom.xml                                                         | 2 +-
 ...Final.LICENSE.txt => netty-buffer-4.1.137.Final.LICENSE.txt} | 0
 ....Final.LICENSE.txt => netty-codec-4.1.137.Final.LICENSE.txt} | 0
 ...Final.LICENSE.txt => netty-common-4.1.137.Final.LICENSE.txt} | 0
 ...inal.LICENSE.txt => netty-handler-4.1.137.Final.LICENSE.txt} | 0
 ...nal.LICENSE.txt => netty-resolver-4.1.137.Final.LICENSE.txt} | 0
 ...al.LICENSE.txt => netty-transport-4.1.137.Final.LICENSE.txt} | 0
 ... => netty-transport-classes-epoll-4.1.137.Final.LICENSE.txt} | 0
 ...etty-transport-native-unix-common-4.1.137.Final.LICENSE.txt} | 0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename zookeeper-server/src/main/resources/lib/{netty-buffer-4.1.136.Final.LICENSE.txt => netty-buffer-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-codec-4.1.136.Final.LICENSE.txt => netty-codec-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-common-4.1.136.Final.LICENSE.txt => netty-common-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-handler-4.1.136.Final.LICENSE.txt => netty-handler-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-resolver-4.1.136.Final.LICENSE.txt => netty-resolver-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-4.1.136.Final.LICENSE.txt => netty-transport-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-classes-epoll-4.1.136.Final.LICENSE.txt => netty-transport-classes-epoll-4.1.137.Final.LICENSE.txt} (100%)
 rename zookeeper-server/src/main/resources/lib/{netty-transport-native-unix-common-4.1.136.Final.LICENSE.txt => netty-transport-native-unix-common-4.1.137.Final.LICENSE.txt} (100%)

diff --git a/pom.xml b/pom.xml
index c42046fea85..60b9903d5a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,7 +546,7 @@
     <mockito.version>5.23.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.136.Final</netty.version>
+    <netty.version>4.1.137.Final</netty.version>
     <jetty.version>12.1.12</jetty.version>
     <!-- Servlet API version required by Jetty EE10 (see ee10.jakarta.servlet.api.version in jetty-ee10) -->
     <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-buffer-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-codec-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-common-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-common-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-handler-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-resolver-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.137.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.136.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.137.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.136.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.137.Final.LICENSE.txt