From bf1ead82f64fa4dd0b1baa10d9477a76b21d45c0 Mon Sep 17 00:00:00 2001
From: mateczagany <czmate10@gmail.com>
Date: Thu, 16 Oct 2025 19:45:55 +0200
Subject: [PATCH] [FLINK-38527] Upgrade Netty version to 4.1.128.Final

---
 .../src/main/resources/META-INF/NOTICE        | 69 ++++++++++---------
 flink-shaded-netty-tcnative-dynamic/pom.xml   |  6 +-
 .../src/main/resources/META-INF/NOTICE        | 12 ++--
 flink-shaded-netty-tcnative-static/pom.xml    |  2 +-
 .../src/main/resources/META-INF/NOTICE        | 16 ++---
 .../src/main/resources/META-INF/NOTICE        | 18 ++---
 .../src/main/resources/META-INF/NOTICE        | 18 ++---
 .../src/main/resources/META-INF/NOTICE        | 18 ++---
 .../src/main/resources/META-INF/NOTICE        | 18 ++---
 pom.xml                                       |  2 +-
 10 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
index b7e51aa3..8a945687 100644
--- a/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
@@ -6,37 +6,38 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- io.netty:netty-all:4.1.91.Final
-- io.netty:netty-buffer:4.1.91.Final
-- io.netty:netty-codec-dns:4.1.91.Final
-- io.netty:netty-codec-haproxy:4.1.91.Final
-- io.netty:netty-codec-http2:4.1.91.Final
-- io.netty:netty-codec-http:4.1.91.Final
-- io.netty:netty-codec-memcache:4.1.91.Final
-- io.netty:netty-codec-mqtt:4.1.91.Final
-- io.netty:netty-codec-redis:4.1.91.Final
-- io.netty:netty-codec-smtp:4.1.91.Final
-- io.netty:netty-codec-socks:4.1.91.Final
-- io.netty:netty-codec-stomp:4.1.91.Final
-- io.netty:netty-codec-xml:4.1.91.Final
-- io.netty:netty-codec:4.1.91.Final
-- io.netty:netty-common:4.1.91.Final
-- io.netty:netty-handler-proxy:4.1.91.Final
-- io.netty:netty-handler-ssl-ocsp:4.1.91.Final
-- io.netty:netty-handler:4.1.91.Final
-- io.netty:netty-resolver-dns-classes-macos:4.1.91.Final
-- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.91.Final
-- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.91.Final
-- io.netty:netty-resolver-dns:4.1.91.Final
-- io.netty:netty-resolver:4.1.91.Final
-- io.netty:netty-transport-classes-epoll:4.1.91.Final
-- io.netty:netty-transport-classes-kqueue:4.1.91.Final
-- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.91.Final
-- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.91.Final
-- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.91.Final
-- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.91.Final
-- io.netty:netty-transport-native-unix-common:4.1.91.Final
-- io.netty:netty-transport-rxtx:4.1.91.Final
-- io.netty:netty-transport-sctp:4.1.91.Final
-- io.netty:netty-transport-udt:4.1.91.Final
-- io.netty:netty-transport:4.1.91.Final
\ No newline at end of file
+- io.netty:netty-all:4.1.128.Final
+- io.netty:netty-buffer:4.1.128.Final
+- io.netty:netty-codec-dns:4.1.128.Final
+- io.netty:netty-codec-haproxy:4.1.128.Final
+- io.netty:netty-codec-http2:4.1.128.Final
+- io.netty:netty-codec-http:4.1.128.Final
+- io.netty:netty-codec-memcache:4.1.128.Final
+- io.netty:netty-codec-mqtt:4.1.128.Final
+- io.netty:netty-codec-redis:4.1.128.Final
+- io.netty:netty-codec-smtp:4.1.128.Final
+- io.netty:netty-codec-socks:4.1.128.Final
+- io.netty:netty-codec-stomp:4.1.128.Final
+- io.netty:netty-codec-xml:4.1.128.Final
+- io.netty:netty-codec:4.1.128.Final
+- io.netty:netty-common:4.1.128.Final
+- io.netty:netty-handler-proxy:4.1.128.Final
+- io.netty:netty-handler-ssl-ocsp:4.1.128.Final
+- io.netty:netty-handler:4.1.128.Final
+- io.netty:netty-resolver-dns-classes-macos:4.1.128.Final
+- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.128.Final
+- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.128.Final
+- io.netty:netty-resolver-dns:4.1.128.Final
+- io.netty:netty-resolver:4.1.128.Final
+- io.netty:netty-transport-classes-epoll:4.1.128.Final
+- io.netty:netty-transport-classes-kqueue:4.1.128.Final
+- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.128.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.128.Final
+- io.netty:netty-transport-native-epoll:linux-riscv64:4.1.128.Final
+- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.128.Final
+- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.128.Final
+- io.netty:netty-transport-native-unix-common:4.1.128.Final
+- io.netty:netty-transport-rxtx:4.1.128.Final
+- io.netty:netty-transport-sctp:4.1.128.Final
+- io.netty:netty-transport-udt:4.1.128.Final
+- io.netty:netty-transport:4.1.128.Final
diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml
index d723db18..88c1bac7 100644
--- a/flink-shaded-netty-tcnative-dynamic/pom.xml
+++ b/flink-shaded-netty-tcnative-dynamic/pom.xml
@@ -34,7 +34,7 @@ under the License.
 
     <properties>
         <!-- This is based on the "tcnative.version" property in the netty root pom-->
-        <netty.tcnative.version>2.0.59.Final</netty.tcnative.version>
+        <netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
     </properties>
 
     <dependencies>
@@ -124,7 +124,7 @@ under the License.
                             <groupId>io.netty</groupId>
                             <artifactId>netty-tcnative</artifactId>
                             <version>${netty.tcnative.version}</version>
-                            <classifier>linux-aarch_64-fedora</classifier>
+                            <classifier>osx-aarch_64</classifier>
                             <type>jar</type>
                             <overWrite>false</overWrite>
                             <outputDirectory>${project.build.directory}/native_libs</outputDirectory>
@@ -148,7 +148,7 @@ under the License.
                                 <!-- Fix the dynamically linked native libraries in netty-tcnative -->
                                 <unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-linux-x86_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
                                 <unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-osx-x86_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
-                                <unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-linux-aarch_64-fedora.jar" dest="${project.build.directory}/native_libs/unpacked/" />
+                                <unzip src="${project.build.directory}/native_libs/netty-tcnative-${netty.tcnative.version}-osx-aarch_64.jar" dest="${project.build.directory}/native_libs/unpacked/" />
                                 <move todir="${project.build.directory}/unpacked/META-INF/native" includeemptydirs="false">
                                     <fileset dir="${project.build.directory}/native_libs/unpacked/META-INF/native"/>
                                     <mapper type="glob" from="lib*" to="liborg_apache_flink_shaded_netty4_*"/>
diff --git a/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE
index d9135692..b9f1e5a6 100644
--- a/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-netty-tcnative-dynamic/src/main/resources/META-INF/NOTICE
@@ -6,9 +6,9 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- io.netty:netty-tcnative-classes:2.0.59.Final
-- io.netty:netty-tcnative:2.0.59.Final
-- io.netty:netty-tcnative:linux-aarch_64-fedora:2.0.59.Final
-- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.59.Final
-- io.netty:netty-tcnative:linux-x86_64:2.0.59.Final
-- io.netty:netty-tcnative:osx-x86_64:2.0.59.Final
\ No newline at end of file
+- io.netty:netty-tcnative-classes:2.0.74.Final
+- io.netty:netty-tcnative:2.0.74.Final
+- io.netty:netty-tcnative:linux-x86_64-fedora:2.0.74.Final
+- io.netty:netty-tcnative:linux-x86_64:2.0.74.Final
+- io.netty:netty-tcnative:osx-x86_64:2.0.74.Final
+- io.netty:netty-tcnative:osx-aarch_64:2.0.74.Final
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index dfab65a3..b60e586c 100644
--- a/flink-shaded-netty-tcnative-static/pom.xml
+++ b/flink-shaded-netty-tcnative-static/pom.xml
@@ -34,7 +34,7 @@ under the License.
 
     <properties>
         <!-- This is based on the "tcnative.version" property in the netty root pom-->
-        <netty.tcnative.version>2.0.59.Final</netty.tcnative.version>
+        <netty.tcnative.version>2.0.74.Final</netty.tcnative.version>
     </properties>
 
     <dependencies>
diff --git a/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE
index bb3e6a90..1a5ccfe6 100644
--- a/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-netty-tcnative-static/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-shaded-netty-openssl-static
+flink-shaded-netty-tcnative-static
 Copyright 2014-2021 The Apache Software Foundation
 
 This project includes software developed at
@@ -6,13 +6,13 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- io.netty:netty-tcnative-boringssl-static:2.0.59.Final
-- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.59.Final
-- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.59.Final
-- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.59.Final
-- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.59.Final
-- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.59.Final
-- io.netty:netty-tcnative-classes:2.0.59.Final
+- io.netty:netty-tcnative-boringssl-static:2.0.74.Final
+- io.netty:netty-tcnative-boringssl-static:linux-aarch_64:2.0.74.Final
+- io.netty:netty-tcnative-boringssl-static:linux-x86_64:2.0.74.Final
+- io.netty:netty-tcnative-boringssl-static:osx-aarch_64:2.0.74.Final
+- io.netty:netty-tcnative-boringssl-static:osx-x86_64:2.0.74.Final
+- io.netty:netty-tcnative-boringssl-static:windows-x86_64:2.0.74.Final
+- io.netty:netty-tcnative-classes:2.0.74.Final
 
 This project bundles the following dependencies under the OpenSSL license.
 See bundled license files for details.
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE
index 7dad4484..f031f2b7 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/src/main/resources/META-INF/NOTICE
@@ -7,15 +7,15 @@ The Apache Software Foundation (http://www.apache.org/).
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - com.google.guava:guava:31.1-jre
-- io.netty:netty-buffer:4.1.91.Final
-- io.netty:netty-codec:4.1.91.Final
-- io.netty:netty-common:4.1.91.Final
-- io.netty:netty-handler:4.1.91.Final
-- io.netty:netty-resolver:4.1.91.Final
-- io.netty:netty-transport-classes-epoll:4.1.91.Final
-- io.netty:netty-transport-native-epoll:4.1.91.Final
-- io.netty:netty-transport-native-unix-common:4.1.91.Final
-- io.netty:netty-transport:4.1.91.Final
+- io.netty:netty-buffer:4.1.128.Final
+- io.netty:netty-codec:4.1.128.Final
+- io.netty:netty-common:4.1.128.Final
+- io.netty:netty-handler:4.1.128.Final
+- io.netty:netty-resolver:4.1.128.Final
+- io.netty:netty-transport-classes-epoll:4.1.128.Final
+- io.netty:netty-transport-native-epoll:4.1.128.Final
+- io.netty:netty-transport-native-unix-common:4.1.128.Final
+- io.netty:netty-transport:4.1.128.Final
 - org.apache.curator:curator-client:5.4.0
 - org.apache.curator:curator-framework:5.4.0
 - org.apache.curator:curator-recipes:5.4.0
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
index 1c990aa1..5192555e 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/src/main/resources/META-INF/NOTICE
@@ -8,15 +8,15 @@ This project bundles the following dependencies under the Apache Software Licens
 
 - com.google.guava:guava:31.1-jre
 - io.dropwizard.metrics:metrics-core:3.2.5
-- io.netty:netty-buffer:4.1.91.Final
-- io.netty:netty-codec:4.1.91.Final
-- io.netty:netty-common:4.1.91.Final
-- io.netty:netty-handler:4.1.91.Final
-- io.netty:netty-resolver:4.1.91.Final
-- io.netty:netty-transport-classes-epoll:4.1.91.Final
-- io.netty:netty-transport-native-epoll:4.1.91.Final
-- io.netty:netty-transport-native-unix-common:4.1.91.Final
-- io.netty:netty-transport:4.1.91.Final
+- io.netty:netty-buffer:4.1.128.Final
+- io.netty:netty-codec:4.1.128.Final
+- io.netty:netty-common:4.1.128.Final
+- io.netty:netty-handler:4.1.128.Final
+- io.netty:netty-resolver:4.1.128.Final
+- io.netty:netty-transport-classes-epoll:4.1.128.Final
+- io.netty:netty-transport-native-epoll:4.1.128.Final
+- io.netty:netty-transport-native-unix-common:4.1.128.Final
+- io.netty:netty-transport:4.1.128.Final
 - org.apache.curator:curator-client:5.4.0
 - org.apache.curator:curator-framework:5.4.0
 - org.apache.curator:curator-recipes:5.4.0
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
index 42e154d5..c094beba 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/src/main/resources/META-INF/NOTICE
@@ -8,15 +8,15 @@ This project bundles the following dependencies under the Apache Software Licens
 
 - com.google.guava:guava:31.1-jre
 - io.dropwizard.metrics:metrics-core:4.1.12.1
-- io.netty:netty-buffer:4.1.91.Final
-- io.netty:netty-codec:4.1.91.Final
-- io.netty:netty-common:4.1.91.Final
-- io.netty:netty-handler:4.1.91.Final
-- io.netty:netty-resolver:4.1.91.Final
-- io.netty:netty-transport-classes-epoll:4.1.91.Final
-- io.netty:netty-transport-native-epoll:4.1.91.Final
-- io.netty:netty-transport-native-unix-common:4.1.91.Final
-- io.netty:netty-transport:4.1.91.Final
+- io.netty:netty-buffer:4.1.128.Final
+- io.netty:netty-codec:4.1.128.Final
+- io.netty:netty-common:4.1.128.Final
+- io.netty:netty-handler:4.1.128.Final
+- io.netty:netty-resolver:4.1.128.Final
+- io.netty:netty-transport-classes-epoll:4.1.128.Final
+- io.netty:netty-transport-native-epoll:4.1.128.Final
+- io.netty:netty-transport-native-unix-common:4.1.128.Final
+- io.netty:netty-transport:4.1.128.Final
 - org.apache.curator:curator-client:5.4.0
 - org.apache.curator:curator-framework:5.4.0
 - org.apache.curator:curator-recipes:5.4.0
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
index f13b3ce0..1af46dd4 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
@@ -9,15 +9,15 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.google.guava:guava:31.1-jre
 - commons-io:commons-io:2.11.0
 - io.dropwizard.metrics:metrics-core:4.1.12.1
-- io.netty:netty-buffer:4.1.91.Final
-- io.netty:netty-codec:4.1.91.Final
-- io.netty:netty-common:4.1.91.Final
-- io.netty:netty-handler:4.1.91.Final
-- io.netty:netty-resolver:4.1.91.Final
-- io.netty:netty-transport-classes-epoll:4.1.91.Final
-- io.netty:netty-transport-native-epoll:4.1.91.Final
-- io.netty:netty-transport-native-unix-common:4.1.91.Final
-- io.netty:netty-transport:4.1.91.Final
+- io.netty:netty-buffer:4.1.128.Final
+- io.netty:netty-codec:4.1.128.Final
+- io.netty:netty-common:4.1.128.Final
+- io.netty:netty-handler:4.1.128.Final
+- io.netty:netty-resolver:4.1.128.Final
+- io.netty:netty-transport-classes-epoll:4.1.128.Final
+- io.netty:netty-transport-native-epoll:4.1.128.Final
+- io.netty:netty-transport-native-unix-common:4.1.128.Final
+- io.netty:netty-transport:4.1.128.Final
 - org.apache.curator:curator-client:5.4.0
 - org.apache.curator:curator-framework:5.4.0
 - org.apache.curator:curator-recipes:5.4.0
diff --git a/pom.xml b/pom.xml
index 100450a0..a7d64a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
 
     <properties>
         <shading.prefix>org.apache.flink.shaded</shading.prefix>
-        <netty.version>4.1.91.Final</netty.version>
+        <netty.version>4.1.128.Final</netty.version>
         <jackson.version>2.14.2</jackson.version>
         <!-- The license check requires the artifactId to match the directory that the module resides in.
              This is not the case for several modules in flink-shaded for legacy reasons.