From 4d7f0f871ff5f070ec5c3e7a696312e74495975b Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Sun, 17 Dec 2023 16:53:03 +0800
Subject: [PATCH 1/3] [SPARK-46432][BUILD] Upgrade Netty to 4.1.104.Final

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 36 +++++++++++++--------------
 pom.xml                               |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index ba7c7aee894a6..56f5fe3d9d192 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -189,16 +189,16 @@ metrics-jmx/4.2.21//metrics-jmx-4.2.21.jar
 metrics-json/4.2.21//metrics-json-4.2.21.jar
 metrics-jvm/4.2.21//metrics-jvm-4.2.21.jar
 minlog/1.3.0//minlog-1.3.0.jar
-netty-all/4.1.100.Final//netty-all-4.1.100.Final.jar
-netty-buffer/4.1.100.Final//netty-buffer-4.1.100.Final.jar
-netty-codec-http/4.1.100.Final//netty-codec-http-4.1.100.Final.jar
-netty-codec-http2/4.1.100.Final//netty-codec-http2-4.1.100.Final.jar
-netty-codec-socks/4.1.100.Final//netty-codec-socks-4.1.100.Final.jar
-netty-codec/4.1.100.Final//netty-codec-4.1.100.Final.jar
-netty-common/4.1.100.Final//netty-common-4.1.100.Final.jar
-netty-handler-proxy/4.1.100.Final//netty-handler-proxy-4.1.100.Final.jar
-netty-handler/4.1.100.Final//netty-handler-4.1.100.Final.jar
-netty-resolver/4.1.100.Final//netty-resolver-4.1.100.Final.jar
+netty-all/4.1.104.Final//netty-all-4.1.104.Final.jar
+netty-buffer/4.1.104.Final//netty-buffer-4.1.104.Final.jar
+netty-codec-http/4.1.104.Final//netty-codec-http-4.1.104.Final.jar
+netty-codec-http2/4.1.104.Final//netty-codec-http2-4.1.104.Final.jar
+netty-codec-socks/4.1.104.Final//netty-codec-socks-4.1.104.Final.jar
+netty-codec/4.1.104.Final//netty-codec-4.1.104.Final.jar
+netty-common/4.1.104.Final//netty-common-4.1.104.Final.jar
+netty-handler-proxy/4.1.104.Final//netty-handler-proxy-4.1.104.Final.jar
+netty-handler/4.1.104.Final//netty-handler-4.1.104.Final.jar
+netty-resolver/4.1.104.Final//netty-resolver-4.1.104.Final.jar
 netty-tcnative-boringssl-static/2.0.61.Final//netty-tcnative-boringssl-static-2.0.61.Final.jar
 netty-tcnative-boringssl-static/2.0.61.Final/linux-aarch_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar
 netty-tcnative-boringssl-static/2.0.61.Final/linux-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar
@@ -206,14 +206,14 @@ netty-tcnative-boringssl-static/2.0.61.Final/osx-aarch_64/netty-tcnative-borings
 netty-tcnative-boringssl-static/2.0.61.Final/osx-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar
 netty-tcnative-boringssl-static/2.0.61.Final/windows-x86_64/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar
 netty-tcnative-classes/2.0.61.Final//netty-tcnative-classes-2.0.61.Final.jar
-netty-transport-classes-epoll/4.1.100.Final//netty-transport-classes-epoll-4.1.100.Final.jar
-netty-transport-classes-kqueue/4.1.100.Final//netty-transport-classes-kqueue-4.1.100.Final.jar
-netty-transport-native-epoll/4.1.100.Final/linux-aarch_64/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.100.Final/linux-x86_64/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.100.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.100.Final/osx-x86_64/netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.100.Final//netty-transport-native-unix-common-4.1.100.Final.jar
-netty-transport/4.1.100.Final//netty-transport-4.1.100.Final.jar
+netty-transport-classes-epoll/4.1.104.Final//netty-transport-classes-epoll-4.1.104.Final.jar
+netty-transport-classes-kqueue/4.1.104.Final//netty-transport-classes-kqueue-4.1.104.Final.jar
+netty-transport-native-epoll/4.1.104.Final/linux-aarch_64/netty-transport-native-epoll-4.1.104.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.104.Final/linux-x86_64/netty-transport-native-epoll-4.1.104.Final-linux-x86_64.jar
+netty-transport-native-kqueue/4.1.104.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.104.Final-osx-aarch_64.jar
+netty-transport-native-kqueue/4.1.104.Final/osx-x86_64/netty-transport-native-kqueue-4.1.104.Final-osx-x86_64.jar
+netty-transport-native-unix-common/4.1.104.Final//netty-transport-native-unix-common-4.1.104.Final.jar
+netty-transport/4.1.104.Final//netty-transport-4.1.104.Final.jar
 objenesis/3.3//objenesis-3.3.jar
 okhttp/3.12.12//okhttp-3.12.12.jar
 okio/1.15.0//okio-1.15.0.jar
diff --git a/pom.xml b/pom.xml
index b95f72f8a5c69..002e822294c0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
     <commons-cli.version>1.6.0</commons-cli.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <tink.version>1.9.0</tink.version>
-    <netty.version>4.1.100.Final</netty.version>
+    <netty.version>4.1.104.Final</netty.version>
     <netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
     <!--
     If you are changing Arrow version specification, please check

From c073bd89c14a9f73866fecce8d9b8a4662da71cf Mon Sep 17 00:00:00 2001
From: panbingkun <panbingkun@baidu.com>
Date: Thu, 25 Jan 2024 09:26:37 +0800
Subject: [PATCH 2/3] [SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 2e719b678a9a8..71f9ac8665b09 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -211,6 +211,7 @@ netty-tcnative-classes/2.0.61.Final//netty-tcnative-classes-2.0.61.Final.jar
 netty-transport-classes-epoll/4.1.106.Final//netty-transport-classes-epoll-4.1.106.Final.jar
 netty-transport-classes-kqueue/4.1.106.Final//netty-transport-classes-kqueue-4.1.106.Final.jar
 netty-transport-native-epoll/4.1.106.Final/linux-aarch_64/netty-transport-native-epoll-4.1.106.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.106.Final/linux-riscv64/netty-transport-native-epoll-4.1.106.Final-linux-riscv64.jar
 netty-transport-native-epoll/4.1.106.Final/linux-x86_64/netty-transport-native-epoll-4.1.106.Final-linux-x86_64.jar
 netty-transport-native-kqueue/4.1.106.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.106.Final-osx-aarch_64.jar
 netty-transport-native-kqueue/4.1.106.Final/osx-x86_64/netty-transport-native-kqueue-4.1.106.Final-osx-x86_64.jar

From 2beb166101c47e4e3e9e243f06321dcbc872d6b4 Mon Sep 17 00:00:00 2001
From: panbingkun <panbingkun@baidu.com>
Date: Thu, 25 Jan 2024 18:59:20 +0800
Subject: [PATCH 3/3] [SPARK-46432][BUILD] Upgrade Netty to 4.1.106.Final

---
 common/network-yarn/pom.xml | 44 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index c809bdfbbc1d3..3f2ae21eeb3be 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -173,27 +173,29 @@
             <id>unpack</id>
             <phase>package</phase>
             <configuration>
-                <target>
-                    <echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
-                    <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib" />
-                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
-                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib" />
-                    <jar destfile="${shuffle.jar}" basedir="${project.build.directory}/exploded" />
-                </target>
+              <target>
+                <echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
+                <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_x86_64.jnilib" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_aarch_64.so"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_riscv64.so"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_riscv64.so" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib" />
+                <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
+                  tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib" />
+                <jar destfile="${shuffle.jar}" basedir="${project.build.directory}/exploded" />
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>