From 5a35fb5a7268955622d86a308ac69dbbc35058cf Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 2 Jul 2023 09:38:13 +0100
Subject: [PATCH] HADOOP-18783. Upgrade to netty 4.1.94 due to CVE (#5774).
 Contributed by PJ Fanning.

---
 LICENSE-binary         | 60 +++++++++++++++++++++---------------------
 hadoop-project/pom.xml |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 582ffbdbcf..72318d9bf0 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -259,36 +259,36 @@ io.grpc:grpc-netty:1.26.0
 io.grpc:grpc-protobuf:1.26.0
 io.grpc:grpc-protobuf-lite:1.26.0
 io.grpc:grpc-stub:1.26.0
-io.netty:netty-all:4.1.77.Final
-io.netty:netty-buffer:4.1.77.Final
-io.netty:netty-codec:4.1.77.Final
-io.netty:netty-codec-dns:4.1.77.Final
-io.netty:netty-codec-haproxy:4.1.77.Final
-io.netty:netty-codec-http:4.1.77.Final
-io.netty:netty-codec-http2:4.1.77.Final
-io.netty:netty-codec-memcache:4.1.77.Final
-io.netty:netty-codec-mqtt:4.1.77.Final
-io.netty:netty-codec-redis:4.1.77.Final
-io.netty:netty-codec-smtp:4.1.77.Final
-io.netty:netty-codec-socks:4.1.77.Final
-io.netty:netty-codec-stomp:4.1.77.Final
-io.netty:netty-codec-xml:4.1.77.Final
-io.netty:netty-common:4.1.77.Final
-io.netty:netty-handler:4.1.77.Final
-io.netty:netty-handler-proxy:4.1.77.Final
-io.netty:netty-resolver:4.1.77.Final
-io.netty:netty-resolver-dns:4.1.77.Final
-io.netty:netty-transport:4.1.77.Final
-io.netty:netty-transport-rxtx:4.1.77.Final
-io.netty:netty-transport-sctp:4.1.77.Final
-io.netty:netty-transport-udt:4.1.77.Final
-io.netty:netty-transport-classes-epoll:4.1.77.Final
-io.netty:netty-transport-native-unix-common:4.1.77.Final
-io.netty:netty-transport-classes-kqueue:4.1.77.Final
-io.netty:netty-resolver-dns-classes-macos:4.1.77.Final
-io.netty:netty-transport-native-epoll:4.1.77.Final
-io.netty:netty-transport-native-kqueue:4.1.77.Final
-io.netty:netty-resolver-dns-native-macos:4.1.77.Final
+io.netty:netty-all:4.1.94.Final
+io.netty:netty-buffer:4.1.94.Final
+io.netty:netty-codec:4.1.94.Final
+io.netty:netty-codec-dns:4.1.94.Final
+io.netty:netty-codec-haproxy:4.1.94.Final
+io.netty:netty-codec-http:4.1.94.Final
+io.netty:netty-codec-http2:4.1.94.Final
+io.netty:netty-codec-memcache:4.1.94.Final
+io.netty:netty-codec-mqtt:4.1.94.Final
+io.netty:netty-codec-redis:4.1.94.Final
+io.netty:netty-codec-smtp:4.1.94.Final
+io.netty:netty-codec-socks:4.1.94.Final
+io.netty:netty-codec-stomp:4.1.94.Final
+io.netty:netty-codec-xml:4.1.94.Final
+io.netty:netty-common:4.1.94.Final
+io.netty:netty-handler:4.1.94.Final
+io.netty:netty-handler-proxy:4.1.94.Final
+io.netty:netty-resolver:4.1.94.Final
+io.netty:netty-resolver-dns:4.1.94.Final
+io.netty:netty-transport:4.1.94.Final
+io.netty:netty-transport-rxtx:4.1.94.Final
+io.netty:netty-transport-sctp:4.1.94.Final
+io.netty:netty-transport-udt:4.1.94.Final
+io.netty:netty-transport-classes-epoll:4.1.94.Final
+io.netty:netty-transport-native-unix-common:4.1.94.Final
+io.netty:netty-transport-classes-kqueue:4.1.94.Final
+io.netty:netty-resolver-dns-classes-macos:4.1.94.Final
+io.netty:netty-transport-native-epoll:4.1.94.Final
+io.netty:netty-transport-native-kqueue:4.1.94.Final
+io.netty:netty-resolver-dns-native-macos:4.1.94.Final
 io.opencensus:opencensus-api:0.12.3
 io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
 io.reactivex:rxjava:1.3.8
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 6e90562f83..5504c51522 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -139,7 +139,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.89.Final</netty4.version>
+    <netty4.version>4.1.94.Final</netty4.version>
     <snappy-java.version>1.1.10.1</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>