Skip to content

Commit 39af9ca

Browse files
committed
[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 929b18d [Cheng Pan] Bump Guava 33.4.8-jre Protobuf 3.25.8 gRPC 1.76.2 8272bef [Cheng Pan] Bump Netty 4.1.128 Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent c0f0fe0 commit 39af9ca

3 files changed

Lines changed: 48 additions & 48 deletions

File tree

dev/dependencyList

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
HikariCP/4.0.3//HikariCP-4.0.3.jar
1919
ST4/4.3.4//ST4-4.3.4.jar
20-
animal-sniffer-annotations/1.23//animal-sniffer-annotations-1.23.jar
20+
animal-sniffer-annotations/1.24//animal-sniffer-annotations-1.24.jar
2121
annotations/4.1.1.4//annotations-4.1.1.4.jar
2222
antlr-runtime/3.5.3//antlr-runtime-3.5.3.jar
2323
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
3131
classgraph/4.8.138//classgraph-4.8.138.jar
3232
commons-codec/1.17.1//commons-codec-1.17.1.jar
3333
commons-lang3/3.18.0//commons-lang3-3.18.0.jar
34-
error_prone_annotations/2.23.0//error_prone_annotations-2.23.0.jar
34+
error_prone_annotations/2.36.0//error_prone_annotations-2.36.0.jar
3535
failsafe/3.3.2//failsafe-3.3.2.jar
36-
failureaccess/1.0.2//failureaccess-1.0.2.jar
36+
failureaccess/1.0.3//failureaccess-1.0.3.jar
3737
flatbuffers-java/23.5.26//flatbuffers-java-23.5.26.jar
3838
fliptables/1.1.1//fliptables-1.1.1.jar
39-
grpc-api/1.65.1//grpc-api-1.65.1.jar
40-
grpc-context/1.65.1//grpc-context-1.65.1.jar
41-
grpc-core/1.65.1//grpc-core-1.65.1.jar
42-
grpc-grpclb/1.65.1//grpc-grpclb-1.65.1.jar
43-
grpc-netty/1.65.1//grpc-netty-1.65.1.jar
44-
grpc-protobuf-lite/1.65.1//grpc-protobuf-lite-1.65.1.jar
45-
grpc-protobuf/1.65.1//grpc-protobuf-1.65.1.jar
46-
grpc-stub/1.65.1//grpc-stub-1.65.1.jar
47-
grpc-util/1.65.1//grpc-util-1.65.1.jar
48-
gson/2.10.1//gson-2.10.1.jar
49-
guava/33.3.1-jre//guava-33.3.1-jre.jar
39+
grpc-api/1.76.2//grpc-api-1.76.2.jar
40+
grpc-context/1.76.2//grpc-context-1.76.2.jar
41+
grpc-core/1.76.2//grpc-core-1.76.2.jar
42+
grpc-grpclb/1.76.2//grpc-grpclb-1.76.2.jar
43+
grpc-netty/1.76.2//grpc-netty-1.76.2.jar
44+
grpc-protobuf-lite/1.76.2//grpc-protobuf-lite-1.76.2.jar
45+
grpc-protobuf/1.76.2//grpc-protobuf-1.76.2.jar
46+
grpc-stub/1.76.2//grpc-stub-1.76.2.jar
47+
grpc-util/1.76.2//grpc-util-1.76.2.jar
48+
gson/2.11.0//gson-2.11.0.jar
49+
guava/33.4.8-jre//guava-33.4.8-jre.jar
5050
hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar
5151
hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar
5252
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
9696
jetty-util-ajax/9.4.57.v20241219//jetty-util-ajax-9.4.57.v20241219.jar
9797
jetty-util/9.4.57.v20241219//jetty-util-9.4.57.v20241219.jar
9898
jline/2.14.6//jline-2.14.6.jar
99+
jspecify/1.0.0//jspecify-1.0.0.jar
99100
jul-to-slf4j/1.7.36//jul-to-slf4j-1.7.36.jar
100101
kafka-clients/3.9.1//kafka-clients-3.9.1.jar
101102
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
136137
metrics-json/4.2.30//metrics-json-4.2.30.jar
137138
metrics-jvm/4.2.30//metrics-jvm-4.2.30.jar
138139
mimepull/1.9.15//mimepull-1.9.15.jar
139-
netty-buffer/4.1.108.Final//netty-buffer-4.1.108.Final.jar
140-
netty-codec-dns/4.1.108.Final//netty-codec-dns-4.1.108.Final.jar
141-
netty-codec-http/4.1.108.Final//netty-codec-http-4.1.108.Final.jar
142-
netty-codec-http2/4.1.108.Final//netty-codec-http2-4.1.108.Final.jar
143-
netty-codec-socks/4.1.108.Final//netty-codec-socks-4.1.108.Final.jar
144-
netty-codec/4.1.108.Final//netty-codec-4.1.108.Final.jar
145-
netty-common/4.1.108.Final//netty-common-4.1.108.Final.jar
146-
netty-handler-proxy/4.1.108.Final//netty-handler-proxy-4.1.108.Final.jar
147-
netty-handler/4.1.108.Final//netty-handler-4.1.108.Final.jar
148-
netty-resolver-dns/4.1.108.Final//netty-resolver-dns-4.1.108.Final.jar
149-
netty-resolver/4.1.108.Final//netty-resolver-4.1.108.Final.jar
150-
netty-transport-classes-epoll/4.1.108.Final//netty-transport-classes-epoll-4.1.108.Final.jar
151-
netty-transport-native-epoll/4.1.108.Final/linux-aarch_64/netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
152-
netty-transport-native-epoll/4.1.108.Final/linux-x86_64/netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
153-
netty-transport-native-unix-common/4.1.108.Final//netty-transport-native-unix-common-4.1.108.Final.jar
154-
netty-transport/4.1.108.Final//netty-transport-4.1.108.Final.jar
140+
netty-buffer/4.1.128.Final//netty-buffer-4.1.128.Final.jar
141+
netty-codec-dns/4.1.128.Final//netty-codec-dns-4.1.128.Final.jar
142+
netty-codec-http/4.1.128.Final//netty-codec-http-4.1.128.Final.jar
143+
netty-codec-http2/4.1.128.Final//netty-codec-http2-4.1.128.Final.jar
144+
netty-codec-socks/4.1.128.Final//netty-codec-socks-4.1.128.Final.jar
145+
netty-codec/4.1.128.Final//netty-codec-4.1.128.Final.jar
146+
netty-common/4.1.128.Final//netty-common-4.1.128.Final.jar
147+
netty-handler-proxy/4.1.128.Final//netty-handler-proxy-4.1.128.Final.jar
148+
netty-handler/4.1.128.Final//netty-handler-4.1.128.Final.jar
149+
netty-resolver-dns/4.1.128.Final//netty-resolver-dns-4.1.128.Final.jar
150+
netty-resolver/4.1.128.Final//netty-resolver-4.1.128.Final.jar
151+
netty-transport-classes-epoll/4.1.128.Final//netty-transport-classes-epoll-4.1.128.Final.jar
152+
netty-transport-native-epoll/4.1.128.Final/linux-aarch_64/netty-transport-native-epoll-4.1.128.Final-linux-aarch_64.jar
153+
netty-transport-native-epoll/4.1.128.Final/linux-x86_64/netty-transport-native-epoll-4.1.128.Final-linux-x86_64.jar
154+
netty-transport-native-unix-common/4.1.128.Final//netty-transport-native-unix-common-4.1.128.Final.jar
155+
netty-transport/4.1.128.Final//netty-transport-4.1.128.Final.jar
155156
okhttp-urlconnection/3.14.9//okhttp-urlconnection-3.14.9.jar
156157
okhttp/3.12.12//okhttp-3.12.12.jar
157158
okio/1.15.0//okio-1.15.0.jar
158159
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
159160
paranamer/2.8.3//paranamer-2.8.3.jar
160-
perfmark-api/0.26.0//perfmark-api-0.26.0.jar
161+
perfmark-api/0.27.0//perfmark-api-0.27.0.jar
161162
postgresql/42.7.2//postgresql-42.7.2.jar
162-
proto-google-common-protos/2.29.0//proto-google-common-protos-2.29.0.jar
163-
protobuf-java-util/3.25.5//protobuf-java-util-3.25.5.jar
164-
protobuf-java/3.25.5//protobuf-java-3.25.5.jar
163+
proto-google-common-protos/2.59.2//proto-google-common-protos-2.59.2.jar
164+
protobuf-java-util/3.25.8//protobuf-java-util-3.25.8.jar
165+
protobuf-java/3.25.8//protobuf-java-3.25.8.jar
165166
scala-library/2.12.19//scala-library-2.12.19.jar
166167
scopt_2.12/4.1.0//scopt_2.12-4.1.0.jar
167168
simpleclient/0.16.0//simpleclient-0.16.0.jar

externals/kyuubi-spark-sql-engine/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@
241241
<include>com.google.android:annotations</include>
242242
<include>com.google.api.grpc:proto-google-common-protos</include>
243243
<include>com.google.code.gson:gson</include>
244-
<include>com.google.errorprone:error_prone_annotations</include>
245244
<include>com.google.guava:*</include>
246245
<include>com.google.j2objc:j2objc-annotations</include>
247246
<include>com.google.protobuf:*</include>
@@ -346,14 +345,6 @@
346345
<pattern>com.google.j2objc.annotations</pattern>
347346
<shadedPattern>${kyuubi.shade.packageName}.com.google.j2objc.annotations</shadedPattern>
348347
</relocation>
349-
<relocation>
350-
<pattern>com.google.errorprone.annotations</pattern>
351-
<shadedPattern>${kyuubi.shade.packageName}.com.google.errorprone.annotations</shadedPattern>
352-
</relocation>
353-
<relocation>
354-
<pattern>org.checkerframework</pattern>
355-
<shadedPattern>${kyuubi.shade.packageName}.org.checkerframework</shadedPattern>
356-
</relocation>
357348
<relocation>
358349
<pattern>com.google.gson</pattern>
359350
<shadedPattern>${kyuubi.shade.packageName}.com.google.gson</shadedPattern>
@@ -367,6 +358,10 @@
367358
<pattern>com.google.api</pattern>
368359
<shadedPattern>${kyuubi.shade.packageName}.com.google.api</shadedPattern>
369360
</relocation>
361+
<relocation>
362+
<pattern>com.google.apps</pattern>
363+
<shadedPattern>${kyuubi.shade.packageName}.com.google.apps</shadedPattern>
364+
</relocation>
370365
<relocation>
371366
<pattern>com.google.cloud</pattern>
372367
<shadedPattern>${kyuubi.shade.packageName}.com.google.cloud</shadedPattern>
@@ -387,6 +382,10 @@
387382
<pattern>com.google.rpc</pattern>
388383
<shadedPattern>${kyuubi.shade.packageName}.com.google.rpc</shadedPattern>
389384
</relocation>
385+
<relocation>
386+
<pattern>com.google.shopping</pattern>
387+
<shadedPattern>${kyuubi.shade.packageName}.com.google.shopping</shadedPattern>
388+
</relocation>
390389
<relocation>
391390
<pattern>com.google.type</pattern>
392391
<shadedPattern>${kyuubi.shade.packageName}.com.google.type</shadedPattern>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@
147147
<flink.archive.query>?action=download</flink.archive.query>
148148
<flink.archive.download.skip>false</flink.archive.download.skip>
149149
<google.jsr305.version>3.0.2</google.jsr305.version>
150-
<grpc.version>1.65.1</grpc.version>
151-
<guava.version>33.3.1-jre</guava.version>
152-
<guava.failureaccess.version>1.0.2</guava.failureaccess.version>
150+
<grpc.version>1.76.2</grpc.version>
151+
<guava.version>33.4.8-jre</guava.version>
152+
<guava.failureaccess.version>1.0.3</guava.failureaccess.version>
153153
<hadoop.version>3.3.6</hadoop.version>
154154
<hikaricp.version>4.0.3</hikaricp.version>
155155
<fliptables.verion>1.1.1</fliptables.verion>
@@ -185,7 +185,7 @@
185185
<log4j.version>2.24.3</log4j.version>
186186
<mysql.jdbc.version>8.4.0</mysql.jdbc.version>
187187
<mockito.version>4.11.0</mockito.version>
188-
<netty.version>4.1.108.Final</netty.version>
188+
<netty.version>4.1.128.Final</netty.version>
189189
<openai.java.version>0.12.0</openai.java.version>
190190
<retrofit.version>2.9.0</retrofit.version>
191191
<paimon.version>0.8.2</paimon.version>
@@ -194,7 +194,7 @@
194194
<postgresql.version>42.7.2</postgresql.version>
195195
<ojdbc.version>23.2.0.0</ojdbc.version>
196196
<prometheus.version>0.16.0</prometheus.version>
197-
<protobuf.version>3.25.5</protobuf.version>
197+
<protobuf.version>3.25.8</protobuf.version>
198198
<scalatest.version>3.2.16</scalatest.version>
199199
<scalatestplus.version>3.2.16.0</scalatestplus.version>
200200
<scopt.version>4.1.0</scopt.version>

0 commit comments

Comments
 (0)