From a0354c9f45ab69beffd37ad6fd4116ff6181fa5c Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Thu, 10 Feb 2022 16:15:28 +0800
Subject: [PATCH 1/5] HADOOP-18079. Upgrade Netty to 4.1.74.

Change-Id: I70703c2fbd176a0d6b1c05a47ae67a83b185eb74
---
 LICENSE-binary         | 42 +++++++++++++++++++++++++++++++-----------
 hadoop-project/pom.xml |  2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 499485263906a..734538cd1b395 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -261,17 +261,37 @@ 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:3.10.6.Final
-io.netty:netty-all:4.1.42.Final
-io.netty:netty-buffer:4.1.27.Final
-io.netty:netty-codec:4.1.27.Final
-io.netty:netty-codec-http:4.1.27.Final
-io.netty:netty-codec-http2:4.1.27.Final
-io.netty:netty-codec-socks:4.1.27.Final
-io.netty:netty-common:4.1.27.Final
-io.netty:netty-handler:4.1.27.Final
-io.netty:netty-handler-proxy:4.1.27.Final
-io.netty:netty-resolver:4.1.27.Final
-io.netty:netty-transport:4.1.27.Final
+io.netty:netty-all:4.1.74.Final
+io.netty:netty-buffer:4.1.74.Final
+io.netty:netty-codec:4.1.74.Final
+io.netty:netty-codec-dns:4.1.74.Final
+io.netty:netty-codec-haproxy:4.1.74.Final
+io.netty:netty-codec-http:4.1.74.Final
+io.netty:netty-codec-http2:4.1.74.Final
+io.netty:netty-codec-memcache:4.1.74.Final
+io.netty:netty-codec-mqtt:4.1.74.Final
+io.netty:netty-codec-redis:4.1.74.Final
+io.netty:netty-codec-smtp:4.1.74.Final
+io.netty:netty-codec-socks:4.1.74.Final
+io.netty:netty-codec-stomp:4.1.74.Final
+io.netty:netty-codec-xml:4.1.74.Final
+io.netty:netty-common:4.1.74.Final
+io.netty:netty-handler:4.1.74.Final
+io.netty:netty-tcnative-classes:2.0.48.Final
+io.netty:netty-handler-proxy:4.1.74.Final
+io.netty:netty-resolver:4.1.74.Final
+io.netty:netty-resolver-dns:4.1.74.Final
+io.netty:netty-transport:4.1.74.Final
+io.netty:netty-transport-rxtx:4.1.74.Final
+io.netty:netty-transport-sctp:4.1.74.Final
+io.netty:netty-transport-udt:4.1.74.Final
+io.netty:netty-transport-classes-epoll:4.1.74.Final
+io.netty:netty-transport-native-unix-common:4.1.74.Final
+io.netty:netty-transport-classes-kqueue:4.1.74.Final
+io.netty:netty-resolver-dns-classes-macos:4.1.74.Final
+io.netty:netty-transport-native-epoll:4.1.74.Final
+io.netty:netty-transport-native-kqueue:4.1.74.Final
+io.netty:netty-resolver-dns-native-macos:4.1.74.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 72504c1825e90..18efdc862fb51 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -144,7 +144,7 @@
     <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.68.Final</netty4.version>
+    <netty4.version>4.1.74.Final</netty4.version>
     <snappy-java.version>1.1.8.2</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>
 

From 9a8f193ed9ec0782c60fd5c03aca51b10c56eb66 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Wed, 16 Feb 2022 16:24:15 +0800
Subject: [PATCH 2/5] Harmonize netty version.

Change-Id: I4607d544d523b28fa80b311e66b0f9d5e5e55589
---
 hadoop-project/pom.xml | 66 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 18efdc862fb51..bac4187357950 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -991,6 +991,72 @@
         <version>${netty4.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec-socks</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler-proxy</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-resolver</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-handler</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-buffer</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-common</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-unix-common</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-epoll</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec</artifactId>
+        <version>${netty4.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>

From 7c154efe6c37c2a06017084b25fb763b2c02af60 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Wed, 27 Apr 2022 17:49:08 -0700
Subject: [PATCH 3/5] Update to netty 4.1.75

Change-Id: I3e3c77b3d0804fd05e6b319690a1e46ac569ed7b
---
 LICENSE-binary         | 61 +++++++++++++++++++++---------------------
 hadoop-project/pom.xml |  2 +-
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 734538cd1b395..f81139b4b5598 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -261,37 +261,36 @@ 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:3.10.6.Final
-io.netty:netty-all:4.1.74.Final
-io.netty:netty-buffer:4.1.74.Final
-io.netty:netty-codec:4.1.74.Final
-io.netty:netty-codec-dns:4.1.74.Final
-io.netty:netty-codec-haproxy:4.1.74.Final
-io.netty:netty-codec-http:4.1.74.Final
-io.netty:netty-codec-http2:4.1.74.Final
-io.netty:netty-codec-memcache:4.1.74.Final
-io.netty:netty-codec-mqtt:4.1.74.Final
-io.netty:netty-codec-redis:4.1.74.Final
-io.netty:netty-codec-smtp:4.1.74.Final
-io.netty:netty-codec-socks:4.1.74.Final
-io.netty:netty-codec-stomp:4.1.74.Final
-io.netty:netty-codec-xml:4.1.74.Final
-io.netty:netty-common:4.1.74.Final
-io.netty:netty-handler:4.1.74.Final
-io.netty:netty-tcnative-classes:2.0.48.Final
-io.netty:netty-handler-proxy:4.1.74.Final
-io.netty:netty-resolver:4.1.74.Final
-io.netty:netty-resolver-dns:4.1.74.Final
-io.netty:netty-transport:4.1.74.Final
-io.netty:netty-transport-rxtx:4.1.74.Final
-io.netty:netty-transport-sctp:4.1.74.Final
-io.netty:netty-transport-udt:4.1.74.Final
-io.netty:netty-transport-classes-epoll:4.1.74.Final
-io.netty:netty-transport-native-unix-common:4.1.74.Final
-io.netty:netty-transport-classes-kqueue:4.1.74.Final
-io.netty:netty-resolver-dns-classes-macos:4.1.74.Final
-io.netty:netty-transport-native-epoll:4.1.74.Final
-io.netty:netty-transport-native-kqueue:4.1.74.Final
-io.netty:netty-resolver-dns-native-macos:4.1.74.Final
+io.netty:netty-all:4.1.75.Final
+io.netty:netty-buffer:4.1.75.Final
+io.netty:netty-codec:4.1.75.Final
+io.netty:netty-codec-dns:4.1.75.Final
+io.netty:netty-codec-haproxy:4.1.75.Final
+io.netty:netty-codec-http:4.1.75.Final
+io.netty:netty-codec-http2:4.1.75.Final
+io.netty:netty-codec-memcache:4.1.75.Final
+io.netty:netty-codec-mqtt:4.1.75.Final
+io.netty:netty-codec-redis:4.1.75.Final
+io.netty:netty-codec-smtp:4.1.75.Final
+io.netty:netty-codec-socks:4.1.75.Final
+io.netty:netty-codec-stomp:4.1.75.Final
+io.netty:netty-codec-xml:4.1.75.Final
+io.netty:netty-common:4.1.75.Final
+io.netty:netty-handler:4.1.75.Final
+io.netty:netty-handler-proxy:4.1.75.Final
+io.netty:netty-resolver:4.1.75.Final
+io.netty:netty-resolver-dns:4.1.75.Final
+io.netty:netty-transport:4.1.75.Final
+io.netty:netty-transport-rxtx:4.1.75.Final
+io.netty:netty-transport-sctp:4.1.75.Final
+io.netty:netty-transport-udt:4.1.75.Final
+io.netty:netty-transport-classes-epoll:4.1.75.Final
+io.netty:netty-transport-native-unix-common:4.1.75.Final
+io.netty:netty-transport-classes-kqueue:4.1.75.Final
+io.netty:netty-resolver-dns-classes-macos:4.1.75.Final
+io.netty:netty-transport-native-epoll:4.1.75.Final
+io.netty:netty-transport-native-kqueue:4.1.75.Final
+io.netty:netty-resolver-dns-native-macos:4.1.75.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 bac4187357950..2c8bea19c342e 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -144,7 +144,7 @@
     <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.74.Final</netty4.version>
+    <netty4.version>4.1.75.Final</netty4.version>
     <snappy-java.version>1.1.8.2</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>
 

From 906981e9e65b093bcaf76082a38f956f77b64ad4 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Fri, 29 Apr 2022 18:27:08 -0700
Subject: [PATCH 4/5] Update to Netty 4.1.76

Change-Id: Id5d6eef9e364e136b1f723b0876fb4234f8d96e1
---
 LICENSE-binary         | 60 +++++++++++++++++++++---------------------
 hadoop-project/pom.xml |  8 +-----
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index f81139b4b5598..5f8ae0968c34e 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -261,36 +261,36 @@ 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:3.10.6.Final
-io.netty:netty-all:4.1.75.Final
-io.netty:netty-buffer:4.1.75.Final
-io.netty:netty-codec:4.1.75.Final
-io.netty:netty-codec-dns:4.1.75.Final
-io.netty:netty-codec-haproxy:4.1.75.Final
-io.netty:netty-codec-http:4.1.75.Final
-io.netty:netty-codec-http2:4.1.75.Final
-io.netty:netty-codec-memcache:4.1.75.Final
-io.netty:netty-codec-mqtt:4.1.75.Final
-io.netty:netty-codec-redis:4.1.75.Final
-io.netty:netty-codec-smtp:4.1.75.Final
-io.netty:netty-codec-socks:4.1.75.Final
-io.netty:netty-codec-stomp:4.1.75.Final
-io.netty:netty-codec-xml:4.1.75.Final
-io.netty:netty-common:4.1.75.Final
-io.netty:netty-handler:4.1.75.Final
-io.netty:netty-handler-proxy:4.1.75.Final
-io.netty:netty-resolver:4.1.75.Final
-io.netty:netty-resolver-dns:4.1.75.Final
-io.netty:netty-transport:4.1.75.Final
-io.netty:netty-transport-rxtx:4.1.75.Final
-io.netty:netty-transport-sctp:4.1.75.Final
-io.netty:netty-transport-udt:4.1.75.Final
-io.netty:netty-transport-classes-epoll:4.1.75.Final
-io.netty:netty-transport-native-unix-common:4.1.75.Final
-io.netty:netty-transport-classes-kqueue:4.1.75.Final
-io.netty:netty-resolver-dns-classes-macos:4.1.75.Final
-io.netty:netty-transport-native-epoll:4.1.75.Final
-io.netty:netty-transport-native-kqueue:4.1.75.Final
-io.netty:netty-resolver-dns-native-macos:4.1.75.Final
+io.netty:netty-all:4.1.76.Final
+io.netty:netty-buffer:4.1.76.Final
+io.netty:netty-codec:4.1.76.Final
+io.netty:netty-codec-dns:4.1.76.Final
+io.netty:netty-codec-haproxy:4.1.76.Final
+io.netty:netty-codec-http:4.1.76.Final
+io.netty:netty-codec-http2:4.1.76.Final
+io.netty:netty-codec-memcache:4.1.76.Final
+io.netty:netty-codec-mqtt:4.1.76.Final
+io.netty:netty-codec-redis:4.1.76.Final
+io.netty:netty-codec-smtp:4.1.76.Final
+io.netty:netty-codec-socks:4.1.76.Final
+io.netty:netty-codec-stomp:4.1.76.Final
+io.netty:netty-codec-xml:4.1.76.Final
+io.netty:netty-common:4.1.76.Final
+io.netty:netty-handler:4.1.76.Final
+io.netty:netty-handler-proxy:4.1.76.Final
+io.netty:netty-resolver:4.1.76.Final
+io.netty:netty-resolver-dns:4.1.76.Final
+io.netty:netty-transport:4.1.76.Final
+io.netty:netty-transport-rxtx:4.1.76.Final
+io.netty:netty-transport-sctp:4.1.76.Final
+io.netty:netty-transport-udt:4.1.76.Final
+io.netty:netty-transport-classes-epoll:4.1.76.Final
+io.netty:netty-transport-native-unix-common:4.1.76.Final
+io.netty:netty-transport-classes-kqueue:4.1.76.Final
+io.netty:netty-resolver-dns-classes-macos:4.1.76.Final
+io.netty:netty-transport-native-epoll:4.1.76.Final
+io.netty:netty-transport-native-kqueue:4.1.76.Final
+io.netty:netty-resolver-dns-native-macos:4.1.76.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 2c8bea19c342e..32ea5ab1ac592 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -144,7 +144,7 @@
     <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.75.Final</netty4.version>
+    <netty4.version>4.1.76.Final</netty4.version>
     <snappy-java.version>1.1.8.2</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>
 
@@ -1039,12 +1039,6 @@
         <version>${netty4.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${netty4.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>

From 8ee426f8ee370c4ac3db1ee3680de32106d56e68 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Tue, 12 Jul 2022 11:22:52 -0700
Subject: [PATCH 5/5] Bump version to 4.1.77.

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

diff --git a/LICENSE-binary b/LICENSE-binary
index 5f8ae0968c34e..3d06ad9e93a8d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -261,36 +261,36 @@ 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:3.10.6.Final
-io.netty:netty-all:4.1.76.Final
-io.netty:netty-buffer:4.1.76.Final
-io.netty:netty-codec:4.1.76.Final
-io.netty:netty-codec-dns:4.1.76.Final
-io.netty:netty-codec-haproxy:4.1.76.Final
-io.netty:netty-codec-http:4.1.76.Final
-io.netty:netty-codec-http2:4.1.76.Final
-io.netty:netty-codec-memcache:4.1.76.Final
-io.netty:netty-codec-mqtt:4.1.76.Final
-io.netty:netty-codec-redis:4.1.76.Final
-io.netty:netty-codec-smtp:4.1.76.Final
-io.netty:netty-codec-socks:4.1.76.Final
-io.netty:netty-codec-stomp:4.1.76.Final
-io.netty:netty-codec-xml:4.1.76.Final
-io.netty:netty-common:4.1.76.Final
-io.netty:netty-handler:4.1.76.Final
-io.netty:netty-handler-proxy:4.1.76.Final
-io.netty:netty-resolver:4.1.76.Final
-io.netty:netty-resolver-dns:4.1.76.Final
-io.netty:netty-transport:4.1.76.Final
-io.netty:netty-transport-rxtx:4.1.76.Final
-io.netty:netty-transport-sctp:4.1.76.Final
-io.netty:netty-transport-udt:4.1.76.Final
-io.netty:netty-transport-classes-epoll:4.1.76.Final
-io.netty:netty-transport-native-unix-common:4.1.76.Final
-io.netty:netty-transport-classes-kqueue:4.1.76.Final
-io.netty:netty-resolver-dns-classes-macos:4.1.76.Final
-io.netty:netty-transport-native-epoll:4.1.76.Final
-io.netty:netty-transport-native-kqueue:4.1.76.Final
-io.netty:netty-resolver-dns-native-macos:4.1.76.Final
+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.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 32ea5ab1ac592..2f94001b46ac6 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -144,7 +144,7 @@
     <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.76.Final</netty4.version>
+    <netty4.version>4.1.77.Final</netty4.version>
     <snappy-java.version>1.1.8.2</snappy-java.version>
     <lz4-java.version>1.7.1</lz4-java.version>