From e828b8dd5565935a54404b501a9e131d734fbb96 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Sun, 5 Jan 2025 10:51:08 -0800
Subject: [PATCH] [improve] Upgrade to Netty 4.1.116.Final and io_uring to
 0.0.26.Final (#23813)

(cherry picked from commit 2bd97845bdbc11733ee5ff2eaa5cd16e96129180)
---
 buildtools/pom.xml                            |  2 +-
 .../server/src/assemble/LICENSE.bin.txt       | 46 +++++++++----------
 .../shell/src/assemble/LICENSE.bin.txt        | 44 +++++++++---------
 pom.xml                                       |  4 +-
 pulsar-sql/presto-distribution/LICENSE        | 44 +++++++++---------
 5 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 4ff5519c510fe..39e0825952d8b 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -47,7 +47,7 @@
     <license-maven-plugin.version>4.1</license-maven-plugin.version>
     <puppycrawl.checkstyle.version>10.14.2</puppycrawl.checkstyle.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <netty.version>4.1.115.Final</netty.version>
+    <netty.version>4.1.116.Final</netty.version>
     <guice.version>4.2.3</guice.version>
     <guava.version>32.1.1-jre</guava.version>
     <ant.version>1.10.12</ant.version>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index c17b4e87df8d0..57780d2581ed7 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -289,26 +289,26 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-lang3-3.11.jar
     - org.apache.commons-commons-text-1.10.0.jar
  * Netty
-    - io.netty-netty-buffer-4.1.115.Final.jar
-    - io.netty-netty-codec-4.1.115.Final.jar
-    - io.netty-netty-codec-dns-4.1.115.Final.jar
-    - io.netty-netty-codec-http-4.1.115.Final.jar
-    - io.netty-netty-codec-http2-4.1.115.Final.jar
-    - io.netty-netty-codec-socks-4.1.115.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.115.Final.jar
-    - io.netty-netty-common-4.1.115.Final.jar
-    - io.netty-netty-handler-4.1.115.Final.jar
-    - io.netty-netty-handler-proxy-4.1.115.Final.jar
-    - io.netty-netty-resolver-4.1.115.Final.jar
-    - io.netty-netty-resolver-dns-4.1.115.Final.jar
-    - io.netty-netty-resolver-dns-classes-macos-4.1.115.Final.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.115.Final-osx-aarch_64.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.115.Final-osx-x86_64.jar
-    - io.netty-netty-transport-4.1.115.Final.jar
-    - io.netty-netty-transport-classes-epoll-4.1.115.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-unix-common-4.1.115.Final.jar
+    - io.netty-netty-buffer-4.1.116.Final.jar
+    - io.netty-netty-codec-4.1.116.Final.jar
+    - io.netty-netty-codec-dns-4.1.116.Final.jar
+    - io.netty-netty-codec-http-4.1.116.Final.jar
+    - io.netty-netty-codec-http2-4.1.116.Final.jar
+    - io.netty-netty-codec-socks-4.1.116.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.116.Final.jar
+    - io.netty-netty-common-4.1.116.Final.jar
+    - io.netty-netty-handler-4.1.116.Final.jar
+    - io.netty-netty-handler-proxy-4.1.116.Final.jar
+    - io.netty-netty-resolver-4.1.116.Final.jar
+    - io.netty-netty-resolver-dns-4.1.116.Final.jar
+    - io.netty-netty-resolver-dns-classes-macos-4.1.116.Final.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.116.Final-osx-aarch_64.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.116.Final-osx-x86_64.jar
+    - io.netty-netty-transport-4.1.116.Final.jar
+    - io.netty-netty-transport-classes-epoll-4.1.116.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.116.Final-linux-aarch_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-unix-common-4.1.116.Final.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.69.Final.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
@@ -316,9 +316,9 @@ The Apache Software License, Version 2.0
     - io.netty-netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar
     - io.netty-netty-tcnative-classes-2.0.69.Final.jar
-    - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.21.Final.jar
-    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
+    - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.26.Final.jar
+    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar
+    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar
  * Prometheus client
     - io.prometheus.jmx-collector-0.16.1.jar
     - io.prometheus-simpleclient-0.16.0.jar
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index 9b84163b9ae8a..3dd9dd8987f60 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -348,22 +348,22 @@ The Apache Software License, Version 2.0
     - commons-text-1.10.0.jar
     - commons-compress-1.26.0.jar
  * Netty
-    - netty-buffer-4.1.115.Final.jar
-    - netty-codec-4.1.115.Final.jar
-    - netty-codec-dns-4.1.115.Final.jar
-    - netty-codec-http-4.1.115.Final.jar
-    - netty-codec-socks-4.1.115.Final.jar
-    - netty-codec-haproxy-4.1.115.Final.jar
-    - netty-common-4.1.115.Final.jar
-    - netty-handler-4.1.115.Final.jar
-    - netty-handler-proxy-4.1.115.Final.jar
-    - netty-resolver-4.1.115.Final.jar
-    - netty-resolver-dns-4.1.115.Final.jar
-    - netty-transport-4.1.115.Final.jar
-    - netty-transport-classes-epoll-4.1.115.Final.jar
-    - netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
-    - netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.115.Final.jar
+    - netty-buffer-4.1.116.Final.jar
+    - netty-codec-4.1.116.Final.jar
+    - netty-codec-dns-4.1.116.Final.jar
+    - netty-codec-http-4.1.116.Final.jar
+    - netty-codec-socks-4.1.116.Final.jar
+    - netty-codec-haproxy-4.1.116.Final.jar
+    - netty-common-4.1.116.Final.jar
+    - netty-handler-4.1.116.Final.jar
+    - netty-handler-proxy-4.1.116.Final.jar
+    - netty-resolver-4.1.116.Final.jar
+    - netty-resolver-dns-4.1.116.Final.jar
+    - netty-transport-4.1.116.Final.jar
+    - netty-transport-classes-epoll-4.1.116.Final.jar
+    - netty-transport-native-epoll-4.1.116.Final-linux-aarch_64.jar
+    - netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.116.Final.jar
     - netty-tcnative-boringssl-static-2.0.69.Final.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
@@ -371,12 +371,12 @@ The Apache Software License, Version 2.0
     - netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar
     - netty-tcnative-classes-2.0.69.Final.jar
-    - netty-incubator-transport-classes-io_uring-0.0.21.Final.jar
-    - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
-    - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-    - netty-resolver-dns-classes-macos-4.1.115.Final.jar
-    - netty-resolver-dns-native-macos-4.1.115.Final-osx-aarch_64.jar
-    - netty-resolver-dns-native-macos-4.1.115.Final-osx-x86_64.jar
+    - netty-incubator-transport-classes-io_uring-0.0.26.Final.jar
+    - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar
+    - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar
+    - netty-resolver-dns-classes-macos-4.1.116.Final.jar
+    - netty-resolver-dns-native-macos-4.1.116.Final-osx-aarch_64.jar
+    - netty-resolver-dns-native-macos-4.1.116.Final-osx-x86_64.jar
  * Prometheus client
     - simpleclient-0.16.0.jar
     - simpleclient_log4j2-0.16.0.jar
diff --git a/pom.xml b/pom.xml
index e00dd6f2c8544..89440a0f7ad6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,8 +143,8 @@ flexible messaging model and an intuitive client API.</description>
     <snappy.version>1.1.10.5</snappy.version> <!-- ZooKeeper server -->
     <dropwizardmetrics.version>4.1.12.1</dropwizardmetrics.version> <!-- ZooKeeper server -->
     <curator.version>5.7.1</curator.version>
-    <netty.version>4.1.115.Final</netty.version>
-    <netty-iouring.version>0.0.21.Final</netty-iouring.version>
+    <netty.version>4.1.116.Final</netty.version>
+    <netty-iouring.version>0.0.26.Final</netty-iouring.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <jersey.version>2.42</jersey.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 124e59cb6afe2..d83b8009d8022 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -231,21 +231,21 @@ The Apache Software License, Version 2.0
     - commons-compress-1.26.0.jar
     - commons-lang3-3.11.jar
  * Netty
-    - netty-buffer-4.1.115.Final.jar
-    - netty-codec-4.1.115.Final.jar
-    - netty-codec-dns-4.1.115.Final.jar
-    - netty-codec-http-4.1.115.Final.jar
-    - netty-codec-haproxy-4.1.115.Final.jar
-    - netty-codec-socks-4.1.115.Final.jar
-    - netty-handler-proxy-4.1.115.Final.jar
-    - netty-common-4.1.115.Final.jar
-    - netty-handler-4.1.115.Final.jar
+    - netty-buffer-4.1.116.Final.jar
+    - netty-codec-4.1.116.Final.jar
+    - netty-codec-dns-4.1.116.Final.jar
+    - netty-codec-http-4.1.116.Final.jar
+    - netty-codec-haproxy-4.1.116.Final.jar
+    - netty-codec-socks-4.1.116.Final.jar
+    - netty-handler-proxy-4.1.116.Final.jar
+    - netty-common-4.1.116.Final.jar
+    - netty-handler-4.1.116.Final.jar
     - netty-reactive-streams-2.0.6.jar
-    - netty-resolver-4.1.115.Final.jar
-    - netty-resolver-dns-4.1.115.Final.jar
-    - netty-resolver-dns-classes-macos-4.1.115.Final.jar
-    - netty-resolver-dns-native-macos-4.1.115.Final-osx-aarch_64.jar
-    - netty-resolver-dns-native-macos-4.1.115.Final-osx-x86_64.jar
+    - netty-resolver-4.1.116.Final.jar
+    - netty-resolver-dns-4.1.116.Final.jar
+    - netty-resolver-dns-classes-macos-4.1.116.Final.jar
+    - netty-resolver-dns-native-macos-4.1.116.Final-osx-aarch_64.jar
+    - netty-resolver-dns-native-macos-4.1.116.Final-osx-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.69.Final.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-linux-aarch_64.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-linux-x86_64.jar
@@ -253,14 +253,14 @@ The Apache Software License, Version 2.0
     - netty-tcnative-boringssl-static-2.0.69.Final-osx-x86_64.jar
     - netty-tcnative-boringssl-static-2.0.69.Final-windows-x86_64.jar
     - netty-tcnative-classes-2.0.69.Final.jar
-    - netty-transport-4.1.115.Final.jar
-    - netty-transport-classes-epoll-4.1.115.Final.jar
-    - netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
-    - netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.115.Final.jar
-    - netty-incubator-transport-classes-io_uring-0.0.21.Final.jar
-    - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-    - netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
+    - netty-transport-4.1.116.Final.jar
+    - netty-transport-classes-epoll-4.1.116.Final.jar
+    - netty-transport-native-epoll-4.1.116.Final-linux-aarch_64.jar
+    - netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.116.Final.jar
+    - netty-incubator-transport-classes-io_uring-0.0.26.Final.jar
+    - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-x86_64.jar
+    - netty-incubator-transport-native-io_uring-0.0.26.Final-linux-aarch_64.jar
  * GRPC
     - grpc-api-1.55.3.jar
     - grpc-context-1.55.3.jar