This is an automated email from the ASF dual-hosted git repository.
cnauroth pushed a commit to branch branch-3.9
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.9 by this push:
new d81976043 ZOOKEEPER-4897 Upgrade Netty to 4.1.118.Final to fix
CVE-2025-24970 (#2226)
d81976043 is described below
commit d819760438d4269004138886a7ca13a3e2346246
Author: helloworld28 <ohyea...@yeah.net>
AuthorDate: Wed Mar 12 03:22:33 2025 +0800
ZOOKEEPER-4897 Upgrade Netty to 4.1.118.Final to fix CVE-2025-24970 (#2226)
Signed-off-by: Chris Nauroth <cnaur...@apache.org>
Signed-off-by: tison <wander4...@gmail.com>
Co-authored-by: tison <wander4...@gmail.com>
---
pom.xml | 2 +-
...4.1.115.Final.LICENSE.txt => netty-buffer-4.1.119.Final.LICENSE.txt} | 0
...-4.1.115.Final.LICENSE.txt => netty-codec-4.1.119.Final.LICENSE.txt} | 0
...4.1.115.Final.LICENSE.txt => netty-common-4.1.119.Final.LICENSE.txt} | 0
....1.115.Final.LICENSE.txt => netty-handler-4.1.119.Final.LICENSE.txt} | 0
...1.115.Final.LICENSE.txt => netty-resolver-4.1.119.Final.LICENSE.txt} | 0
....115.Final.LICENSE.txt => netty-transport-4.1.119.Final.LICENSE.txt} | 0
...ENSE.txt => netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt} | 0
...txt => netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt} | 0
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 116d1c889..30ff838da 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.115.Final</netty.version>
+ <netty.version>4.1.119.Final</netty.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<jackson.version>2.15.2</jackson.version>
<jline.version>2.14.6</jline.version>
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.115.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.115.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt
