From 71b3a6477b5c3e40719d9e3a20183fa795c1ac30 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 25 Dec 2024 21:00:13 +0100
Subject: [PATCH] HADOOP-19335. Bump netty to 4.1.116 due to CVE-2024-47535
 (#7158). Contributed by PJ Fanning

---
 LICENSE-binary                                | 76 +++++++++----------
 hadoop-project/pom.xml                        |  2 +-
 .../hadoop-yarn/hadoop-yarn-csi/pom.xml       |  4 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 1999e9494bff0..5f5f96d00f1ff 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -251,43 +251,43 @@ commons-daemon:commons-daemon:1.0.13
 commons-io:commons-io:2.16.1
 commons-net:commons-net:3.9.0
 de.ruedigermoeller:fst:2.50
-io.grpc:grpc-api:1.53.0
-io.grpc:grpc-context:1.53.0
-io.grpc:grpc-core:1.53.0
-io.grpc:grpc-netty:1.53.0
-io.grpc:grpc-protobuf:1.53.0
-io.grpc:grpc-protobuf-lite:1.53.0
-io.grpc:grpc-stub:1.53.0
-io.netty:netty-all:4.1.100.Final
-io.netty:netty-buffer:4.1.100.Final
-io.netty:netty-codec:4.1.100.Final
-io.netty:netty-codec-dns:4.1.100.Final
-io.netty:netty-codec-haproxy:4.1.100.Final
-io.netty:netty-codec-http:4.1.100.Final
-io.netty:netty-codec-http2:4.1.100.Final
-io.netty:netty-codec-memcache:4.1.100.Final
-io.netty:netty-codec-mqtt:4.1.100.Final
-io.netty:netty-codec-redis:4.1.100.Final
-io.netty:netty-codec-smtp:4.1.100.Final
-io.netty:netty-codec-socks:4.1.100.Final
-io.netty:netty-codec-stomp:4.1.100.Final
-io.netty:netty-codec-xml:4.1.100.Final
-io.netty:netty-common:4.1.100.Final
-io.netty:netty-handler:4.1.100.Final
-io.netty:netty-handler-proxy:4.1.100.Final
-io.netty:netty-resolver:4.1.100.Final
-io.netty:netty-resolver-dns:4.1.100.Final
-io.netty:netty-transport:4.1.100.Final
-io.netty:netty-transport-rxtx:4.1.100.Final
-io.netty:netty-transport-sctp:4.1.100.Final
-io.netty:netty-transport-udt:4.1.100.Final
-io.netty:netty-transport-classes-epoll:4.1.100.Final
-io.netty:netty-transport-native-unix-common:4.1.100.Final
-io.netty:netty-transport-classes-kqueue:4.1.100.Final
-io.netty:netty-resolver-dns-classes-macos:4.1.100.Final
-io.netty:netty-transport-native-epoll:4.1.100.Final
-io.netty:netty-transport-native-kqueue:4.1.100.Final
-io.netty:netty-resolver-dns-native-macos:4.1.100.Final
+io.grpc:grpc-api:1.69.0
+io.grpc:grpc-context:1.69.0
+io.grpc:grpc-core:1.69.0
+io.grpc:grpc-netty:1.69.0
+io.grpc:grpc-protobuf:1.69.0
+io.grpc:grpc-protobuf-lite:1.69.0
+io.grpc:grpc-stub:1.69.0
+io.netty:netty-all:4.1.116.Final
+io.netty:netty-buffer:4.1.116.Final
+io.netty:netty-codec:4.1.116.Final
+io.netty:netty-codec-dns:4.1.116.Final
+io.netty:netty-codec-haproxy:4.1.116.Final
+io.netty:netty-codec-http:4.1.116.Final
+io.netty:netty-codec-http2:4.1.116.Final
+io.netty:netty-codec-memcache:4.1.116.Final
+io.netty:netty-codec-mqtt:4.1.116.Final
+io.netty:netty-codec-redis:4.1.116.Final
+io.netty:netty-codec-smtp:4.1.116.Final
+io.netty:netty-codec-socks:4.1.116.Final
+io.netty:netty-codec-stomp:4.1.116.Final
+io.netty:netty-codec-xml:4.1.116.Final
+io.netty:netty-common:4.1.116.Final
+io.netty:netty-handler:4.1.116.Final
+io.netty:netty-handler-proxy:4.1.116.Final
+io.netty:netty-resolver:4.1.116.Final
+io.netty:netty-resolver-dns:4.1.116.Final
+io.netty:netty-transport:4.1.116.Final
+io.netty:netty-transport-rxtx:4.1.116.Final
+io.netty:netty-transport-sctp:4.1.116.Final
+io.netty:netty-transport-udt:4.1.116.Final
+io.netty:netty-transport-classes-epoll:4.1.116.Final
+io.netty:netty-transport-native-unix-common:4.1.116.Final
+io.netty:netty-transport-classes-kqueue:4.1.116.Final
+io.netty:netty-resolver-dns-classes-macos:4.1.116.Final
+io.netty:netty-transport-native-epoll:4.1.116.Final
+io.netty:netty-transport-native-kqueue:4.1.116.Final
+io.netty:netty-resolver-dns-native-macos:4.1.116.Final
 io.opencensus:opencensus-api:0.12.3
 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
 io.reactivex:rxjava:1.3.8
@@ -486,7 +486,7 @@ org.bouncycastle:bcpkix-jdk18on:1.78.1
 org.bouncycastle:bcprov-jdk18on:1.78.1
 org.bouncycastle:bcutil-jdk18on:1.78.1
 org.checkerframework:checker-qual:3.8.0
-org.codehaus.mojo:animal-sniffer-annotations:1.21
+org.codehaus.mojo:animal-sniffer-annotations:1.24
 org.jruby.jcodings:jcodings:1.0.13
 org.jruby.joni:joni:2.1.2
 org.ojalgo:ojalgo:43.0
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e28ddff1921dc..0c086f22fba43 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -144,7 +144,7 @@
     <jna.version>5.2.0</jna.version>
     <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
-    <netty4.version>4.1.100.Final</netty4.version>
+    <netty4.version>4.1.116.Final</netty4.version>
     <snappy-java.version>1.1.10.4</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
index bf2f0085d3c6d..3c28b89cf3f00 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
@@ -26,8 +26,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <grpc.version>1.53.0</grpc.version>
-        <animal-sniffer.version>1.21</animal-sniffer.version>
+        <grpc.version>1.69.0</grpc.version>
+        <animal-sniffer.version>1.24</animal-sniffer.version>
     </properties>
 
     <dependencies>