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 39af9ca205 [KYUUBI #7259] Bump Netty 4.1.128 gRPC 1.76.2 Protobuf
3.25.8 Guava 33.4.8-jre
39af9ca205 is described below
commit 39af9ca20589a79fac53d02471d8d09ed1b58a3e
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Dec 15 01:46:29 2025 +0800
[KYUUBI #7259] Bump Netty 4.1.128 gRPC 1.76.2 Protobuf 3.25.8 Guava
33.4.8-jre
### Why are the changes needed?
Bump to the latest 4.1 version of Netty, prepare for upgrading Netty 4.2,
which is a blocker for Spark 4.1 support.
https://github.com/netty/netty/wiki/Netty-4.2-Migration-Guide
Also, upgrade gRPC Protobuf Guava to match the Netty version.
### How was this patch tested?
Pass GHA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #7259 from pan3793/netty-4.1.128.
Closes #7259
929b18d0a [Cheng Pan] Bump Guava 33.4.8-jre Protobuf 3.25.8 gRPC 1.76.2
8272bef82 [Cheng Pan] Bump Netty 4.1.128
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
dev/dependencyList | 69 ++++++++++++++++---------------
externals/kyuubi-spark-sql-engine/pom.xml | 17 ++++----
pom.xml | 10 ++---
3 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/dev/dependencyList b/dev/dependencyList
index b2fd446db5..9f23f6f26a 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -17,7 +17,7 @@
HikariCP/4.0.3//HikariCP-4.0.3.jar
ST4/4.3.4//ST4-4.3.4.jar
-animal-sniffer-annotations/1.23//animal-sniffer-annotations-1.23.jar
+animal-sniffer-annotations/1.24//animal-sniffer-annotations-1.24.jar
annotations/4.1.1.4//annotations-4.1.1.4.jar
antlr-runtime/3.5.3//antlr-runtime-3.5.3.jar
antlr4-runtime/4.9.3//antlr4-runtime-4.9.3.jar
@@ -31,22 +31,22 @@ checker-qual/3.42.0//checker-qual-3.42.0.jar
classgraph/4.8.138//classgraph-4.8.138.jar
commons-codec/1.17.1//commons-codec-1.17.1.jar
commons-lang3/3.18.0//commons-lang3-3.18.0.jar
-error_prone_annotations/2.23.0//error_prone_annotations-2.23.0.jar
+error_prone_annotations/2.36.0//error_prone_annotations-2.36.0.jar
failsafe/3.3.2//failsafe-3.3.2.jar
-failureaccess/1.0.2//failureaccess-1.0.2.jar
+failureaccess/1.0.3//failureaccess-1.0.3.jar
flatbuffers-java/23.5.26//flatbuffers-java-23.5.26.jar
fliptables/1.1.1//fliptables-1.1.1.jar
-grpc-api/1.65.1//grpc-api-1.65.1.jar
-grpc-context/1.65.1//grpc-context-1.65.1.jar
-grpc-core/1.65.1//grpc-core-1.65.1.jar
-grpc-grpclb/1.65.1//grpc-grpclb-1.65.1.jar
-grpc-netty/1.65.1//grpc-netty-1.65.1.jar
-grpc-protobuf-lite/1.65.1//grpc-protobuf-lite-1.65.1.jar
-grpc-protobuf/1.65.1//grpc-protobuf-1.65.1.jar
-grpc-stub/1.65.1//grpc-stub-1.65.1.jar
-grpc-util/1.65.1//grpc-util-1.65.1.jar
-gson/2.10.1//gson-2.10.1.jar
-guava/33.3.1-jre//guava-33.3.1-jre.jar
+grpc-api/1.76.2//grpc-api-1.76.2.jar
+grpc-context/1.76.2//grpc-context-1.76.2.jar
+grpc-core/1.76.2//grpc-core-1.76.2.jar
+grpc-grpclb/1.76.2//grpc-grpclb-1.76.2.jar
+grpc-netty/1.76.2//grpc-netty-1.76.2.jar
+grpc-protobuf-lite/1.76.2//grpc-protobuf-lite-1.76.2.jar
+grpc-protobuf/1.76.2//grpc-protobuf-1.76.2.jar
+grpc-stub/1.76.2//grpc-stub-1.76.2.jar
+grpc-util/1.76.2//grpc-util-1.76.2.jar
+gson/2.11.0//gson-2.11.0.jar
+guava/33.4.8-jre//guava-33.4.8-jre.jar
hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar
hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar
hk2-api/2.6.1//hk2-api-2.6.1.jar
@@ -96,6 +96,7 @@
jetty-servlet/9.4.57.v20241219//jetty-servlet-9.4.57.v20241219.jar
jetty-util-ajax/9.4.57.v20241219//jetty-util-ajax-9.4.57.v20241219.jar
jetty-util/9.4.57.v20241219//jetty-util-9.4.57.v20241219.jar
jline/2.14.6//jline-2.14.6.jar
+jspecify/1.0.0//jspecify-1.0.0.jar
jul-to-slf4j/1.7.36//jul-to-slf4j-1.7.36.jar
kafka-clients/3.9.1//kafka-clients-3.9.1.jar
kubernetes-client-api/6.14.0//kubernetes-client-api-6.14.0.jar
@@ -136,32 +137,32 @@ 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.108.Final//netty-buffer-4.1.108.Final.jar
-netty-codec-dns/4.1.108.Final//netty-codec-dns-4.1.108.Final.jar
-netty-codec-http/4.1.108.Final//netty-codec-http-4.1.108.Final.jar
-netty-codec-http2/4.1.108.Final//netty-codec-http2-4.1.108.Final.jar
-netty-codec-socks/4.1.108.Final//netty-codec-socks-4.1.108.Final.jar
-netty-codec/4.1.108.Final//netty-codec-4.1.108.Final.jar
-netty-common/4.1.108.Final//netty-common-4.1.108.Final.jar
-netty-handler-proxy/4.1.108.Final//netty-handler-proxy-4.1.108.Final.jar
-netty-handler/4.1.108.Final//netty-handler-4.1.108.Final.jar
-netty-resolver-dns/4.1.108.Final//netty-resolver-dns-4.1.108.Final.jar
-netty-resolver/4.1.108.Final//netty-resolver-4.1.108.Final.jar
-netty-transport-classes-epoll/4.1.108.Final//netty-transport-classes-epoll-4.1.108.Final.jar
-netty-transport-native-epoll/4.1.108.Final/linux-aarch_64/netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.108.Final/linux-x86_64/netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
-netty-transport-native-unix-common/4.1.108.Final//netty-transport-native-unix-common-4.1.108.Final.jar
-netty-transport/4.1.108.Final//netty-transport-4.1.108.Final.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
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
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
paranamer/2.8.3//paranamer-2.8.3.jar
-perfmark-api/0.26.0//perfmark-api-0.26.0.jar
+perfmark-api/0.27.0//perfmark-api-0.27.0.jar
postgresql/42.7.2//postgresql-42.7.2.jar
-proto-google-common-protos/2.29.0//proto-google-common-protos-2.29.0.jar
-protobuf-java-util/3.25.5//protobuf-java-util-3.25.5.jar
-protobuf-java/3.25.5//protobuf-java-3.25.5.jar
+proto-google-common-protos/2.59.2//proto-google-common-protos-2.59.2.jar
+protobuf-java-util/3.25.8//protobuf-java-util-3.25.8.jar
+protobuf-java/3.25.8//protobuf-java-3.25.8.jar
scala-library/2.12.19//scala-library-2.12.19.jar
scopt_2.12/4.1.0//scopt_2.12-4.1.0.jar
simpleclient/0.16.0//simpleclient-0.16.0.jar
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml
b/externals/kyuubi-spark-sql-engine/pom.xml
index 08cadcc50d..c84f20315a 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -241,7 +241,6 @@
<include>com.google.android:annotations</include>
<include>com.google.api.grpc:proto-google-common-protos</include>
<include>com.google.code.gson:gson</include>
-
<include>com.google.errorprone:error_prone_annotations</include>
<include>com.google.guava:*</include>
<include>com.google.j2objc:j2objc-annotations</include>
<include>com.google.protobuf:*</include>
@@ -346,14 +345,6 @@
<pattern>com.google.j2objc.annotations</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.j2objc.annotations</shadedPattern>
</relocation>
- <relocation>
-
<pattern>com.google.errorprone.annotations</pattern>
-
<shadedPattern>${kyuubi.shade.packageName}.com.google.errorprone.annotations</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.checkerframework</pattern>
-
<shadedPattern>${kyuubi.shade.packageName}.org.checkerframework</shadedPattern>
- </relocation>
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.gson</shadedPattern>
@@ -367,6 +358,10 @@
<pattern>com.google.api</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.api</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.apps</pattern>
+
<shadedPattern>${kyuubi.shade.packageName}.com.google.apps</shadedPattern>
+ </relocation>
<relocation>
<pattern>com.google.cloud</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.cloud</shadedPattern>
@@ -387,6 +382,10 @@
<pattern>com.google.rpc</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.rpc</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.shopping</pattern>
+
<shadedPattern>${kyuubi.shade.packageName}.com.google.shopping</shadedPattern>
+ </relocation>
<relocation>
<pattern>com.google.type</pattern>
<shadedPattern>${kyuubi.shade.packageName}.com.google.type</shadedPattern>
diff --git a/pom.xml b/pom.xml
index 8ed953fde9..030658b56a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,9 +147,9 @@
<flink.archive.query>?action=download</flink.archive.query>
<flink.archive.download.skip>false</flink.archive.download.skip>
<google.jsr305.version>3.0.2</google.jsr305.version>
- <grpc.version>1.65.1</grpc.version>
- <guava.version>33.3.1-jre</guava.version>
- <guava.failureaccess.version>1.0.2</guava.failureaccess.version>
+ <grpc.version>1.76.2</grpc.version>
+ <guava.version>33.4.8-jre</guava.version>
+ <guava.failureaccess.version>1.0.3</guava.failureaccess.version>
<hadoop.version>3.3.6</hadoop.version>
<hikaricp.version>4.0.3</hikaricp.version>
<fliptables.verion>1.1.1</fliptables.verion>
@@ -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.108.Final</netty.version>
+ <netty.version>4.1.128.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>
@@ -194,7 +194,7 @@
<postgresql.version>42.7.2</postgresql.version>
<ojdbc.version>23.2.0.0</ojdbc.version>
<prometheus.version>0.16.0</prometheus.version>
- <protobuf.version>3.25.5</protobuf.version>
+ <protobuf.version>3.25.8</protobuf.version>
<scalatest.version>3.2.16</scalatest.version>
<scalatestplus.version>3.2.16.0</scalatestplus.version>
<scopt.version>4.1.0</scopt.version>
