This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 18a55503e2 [KYUUBI #7273] Bump Netty 4.2.7
18a55503e2 is described below
commit 18a55503e216d7a35e32b9ad844f453c8447179e
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Dec 15 14:08:12 2025 +0800
[KYUUBI #7273] Bump Netty 4.2.7
### Why are the changes needed?
Upgrade Netty 4.2, which is a blocker for Spark 4.1 support.
https://github.com/netty/netty/wiki/Netty-4.2-Migration-Guide
### How was this patch tested?
Pass GHA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #7273 from pan3793/netty-4.2.7.
Closes #7273
043e60b6c [Cheng Pan] Bump Netty 4.2.7
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
dev/dependencyList | 33 ++++++++++++++++---------------
externals/kyuubi-spark-sql-engine/pom.xml | 13 +++++++++++-
kyuubi-ha/pom.xml | 5 +++++
pom.xml | 4 +++-
4 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/dev/dependencyList b/dev/dependencyList
index 9f23f6f26a..7c5bc158b7 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -137,22 +137,23 @@ metrics-jmx/4.2.30//metrics-jmx-4.2.30.jar
metrics-json/4.2.30//metrics-json-4.2.30.jar
metrics-jvm/4.2.30//metrics-jvm-4.2.30.jar
mimepull/1.9.15//mimepull-1.9.15.jar
-netty-buffer/4.1.128.Final//netty-buffer-4.1.128.Final.jar
-netty-codec-dns/4.1.128.Final//netty-codec-dns-4.1.128.Final.jar
-netty-codec-http/4.1.128.Final//netty-codec-http-4.1.128.Final.jar
-netty-codec-http2/4.1.128.Final//netty-codec-http2-4.1.128.Final.jar
-netty-codec-socks/4.1.128.Final//netty-codec-socks-4.1.128.Final.jar
-netty-codec/4.1.128.Final//netty-codec-4.1.128.Final.jar
-netty-common/4.1.128.Final//netty-common-4.1.128.Final.jar
-netty-handler-proxy/4.1.128.Final//netty-handler-proxy-4.1.128.Final.jar
-netty-handler/4.1.128.Final//netty-handler-4.1.128.Final.jar
-netty-resolver-dns/4.1.128.Final//netty-resolver-dns-4.1.128.Final.jar
-netty-resolver/4.1.128.Final//netty-resolver-4.1.128.Final.jar
-netty-transport-classes-epoll/4.1.128.Final//netty-transport-classes-epoll-4.1.128.Final.jar
-netty-transport-native-epoll/4.1.128.Final/linux-aarch_64/netty-transport-native-epoll-4.1.128.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.128.Final/linux-x86_64/netty-transport-native-epoll-4.1.128.Final-linux-x86_64.jar
-netty-transport-native-unix-common/4.1.128.Final//netty-transport-native-unix-common-4.1.128.Final.jar
-netty-transport/4.1.128.Final//netty-transport-4.1.128.Final.jar
+netty-buffer/4.2.7.Final//netty-buffer-4.2.7.Final.jar
+netty-codec-base/4.2.7.Final//netty-codec-base-4.2.7.Final.jar
+netty-codec-compression/4.2.7.Final//netty-codec-compression-4.2.7.Final.jar
+netty-codec-dns/4.2.7.Final//netty-codec-dns-4.2.7.Final.jar
+netty-codec-http/4.2.7.Final//netty-codec-http-4.2.7.Final.jar
+netty-codec-http2/4.2.7.Final//netty-codec-http2-4.2.7.Final.jar
+netty-codec-socks/4.2.7.Final//netty-codec-socks-4.2.7.Final.jar
+netty-common/4.2.7.Final//netty-common-4.2.7.Final.jar
+netty-handler-proxy/4.2.7.Final//netty-handler-proxy-4.2.7.Final.jar
+netty-handler/4.2.7.Final//netty-handler-4.2.7.Final.jar
+netty-resolver-dns/4.2.7.Final//netty-resolver-dns-4.2.7.Final.jar
+netty-resolver/4.2.7.Final//netty-resolver-4.2.7.Final.jar
+netty-transport-classes-epoll/4.2.7.Final//netty-transport-classes-epoll-4.2.7.Final.jar
+netty-transport-native-epoll/4.2.7.Final/linux-aarch_64/netty-transport-native-epoll-4.2.7.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.2.7.Final/linux-x86_64/netty-transport-native-epoll-4.2.7.Final-linux-x86_64.jar
+netty-transport-native-unix-common/4.2.7.Final//netty-transport-native-unix-common-4.2.7.Final.jar
+netty-transport/4.2.7.Final//netty-transport-4.2.7.Final.jar
okhttp-urlconnection/3.14.9//okhttp-urlconnection-3.14.9.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml
b/externals/kyuubi-spark-sql-engine/pom.xml
index c84f20315a..3b49e815b4 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -255,6 +255,15 @@
<include>org.checkerframework:checker-qual</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
</includes>
+ <excludes>
+ <exclude>io.netty:netty-codec-*-quic</exclude>
+
<exclude>io.netty:netty-resolver-dns-*-macos</exclude>
+
<exclude>io.netty:netty-tcnative-boringssl-static:*:osx-*</exclude>
+
<exclude>io.netty:netty-tcnative-boringssl-static:*:windows-*</exclude>
+
<exclude>io.netty:netty-transport-*-kqueue</exclude>
+
<exclude>io.netty:netty-transport-*-io_uring</exclude>
+
<exclude>io.netty:netty-transport-native-epoll:*:linux-riscv64</exclude>
+ </excludes>
</artifactSet>
<filters>
<filter>
@@ -267,6 +276,8 @@
<exclude>META-INF/DEPENDENCIES</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/license/**</exclude>
+ <exclude>META-INF/licenses/**</exclude>
<exclude>META-INF/maven/**</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>NOTICE.txt</exclude>
@@ -426,7 +437,7 @@
<echo level="info">renaming netty native
libraries</echo>
<move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
<fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
- <mapper
from="libnetty_transport_native_epoll_(aarch_64.so|x86_64.so)"
to="liborg_apache_kyuubi_shade_netty_transport_native_epoll_\1"
type="regexp"></mapper>
+ <mapper
from="libnetty_(tcnative_linux|transport_native_epoll)_(aarch_64.so|x86_64.so)"
to="liborg_apache_kyuubi_shade_netty_\1_\2" type="regexp"></mapper>
</move>
<echo level="info">deleting
META-INF/native-image folder</echo>
<delete
dir="${project.build.directory}/unpacked/META-INF/native-image"></delete>
diff --git a/kyuubi-ha/pom.xml b/kyuubi-ha/pom.xml
index 2ad1ed59b9..5a236777c2 100644
--- a/kyuubi-ha/pom.xml
+++ b/kyuubi-ha/pom.xml
@@ -72,6 +72,11 @@
<artifactId>grpc-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ </dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
diff --git a/pom.xml b/pom.xml
index 030658b56a..3f6acc0c35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
<log4j.version>2.24.3</log4j.version>
<mysql.jdbc.version>8.4.0</mysql.jdbc.version>
<mockito.version>4.11.0</mockito.version>
- <netty.version>4.1.128.Final</netty.version>
+ <netty.version>4.2.7.Final</netty.version>
<openai.java.version>0.12.0</openai.java.version>
<retrofit.version>2.9.0</retrofit.version>
<paimon.version>0.8.2</paimon.version>
@@ -1895,6 +1895,8 @@
However, it will not cause problems
for use. See: https://github.com/scala/bug/issues/12994
-->
<ignoreClass>org.jline.terminal.impl.ffm.*</ignoreClass>
+ <!-- Netty io_uring requires JDK9+ -->
+
<ignoreClass>io.netty.channel.uring.*</ignoreClass>
</ignoreClasses>
</enforceBytecodeVersion>
</rules>
