Skip to content

Commit b877c32

Browse files
committed
Bump Netty 4.2.7
1 parent d4ff829 commit b877c32

File tree

4 files changed

+37
-18
lines changed

4 files changed

+37
-18
lines changed

dev/dependencyList

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,22 +137,23 @@ metrics-jmx/4.2.30//metrics-jmx-4.2.30.jar
137137
metrics-json/4.2.30//metrics-json-4.2.30.jar
138138
metrics-jvm/4.2.30//metrics-jvm-4.2.30.jar
139139
mimepull/1.9.15//mimepull-1.9.15.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
140+
netty-buffer/4.2.7.Final//netty-buffer-4.2.7.Final.jar
141+
netty-codec-base/4.2.7.Final//netty-codec-base-4.2.7.Final.jar
142+
netty-codec-compression/4.2.7.Final//netty-codec-compression-4.2.7.Final.jar
143+
netty-codec-dns/4.2.7.Final//netty-codec-dns-4.2.7.Final.jar
144+
netty-codec-http/4.2.7.Final//netty-codec-http-4.2.7.Final.jar
145+
netty-codec-http2/4.2.7.Final//netty-codec-http2-4.2.7.Final.jar
146+
netty-codec-socks/4.2.7.Final//netty-codec-socks-4.2.7.Final.jar
147+
netty-common/4.2.7.Final//netty-common-4.2.7.Final.jar
148+
netty-handler-proxy/4.2.7.Final//netty-handler-proxy-4.2.7.Final.jar
149+
netty-handler/4.2.7.Final//netty-handler-4.2.7.Final.jar
150+
netty-resolver-dns/4.2.7.Final//netty-resolver-dns-4.2.7.Final.jar
151+
netty-resolver/4.2.7.Final//netty-resolver-4.2.7.Final.jar
152+
netty-transport-classes-epoll/4.2.7.Final//netty-transport-classes-epoll-4.2.7.Final.jar
153+
netty-transport-native-epoll/4.2.7.Final/linux-aarch_64/netty-transport-native-epoll-4.2.7.Final-linux-aarch_64.jar
154+
netty-transport-native-epoll/4.2.7.Final/linux-x86_64/netty-transport-native-epoll-4.2.7.Final-linux-x86_64.jar
155+
netty-transport-native-unix-common/4.2.7.Final//netty-transport-native-unix-common-4.2.7.Final.jar
156+
netty-transport/4.2.7.Final//netty-transport-4.2.7.Final.jar
156157
okhttp-urlconnection/3.14.9//okhttp-urlconnection-3.14.9.jar
157158
okhttp/3.12.12//okhttp-3.12.12.jar
158159
okio/1.15.0//okio-1.15.0.jar

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,15 @@
255255
<include>org.checkerframework:checker-qual</include>
256256
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
257257
</includes>
258+
<excludes>
259+
<exclude>io.netty:netty-codec-*-quic</exclude>
260+
<exclude>io.netty:netty-resolver-dns-*-macos</exclude>
261+
<exclude>io.netty:netty-tcnative-boringssl-static:*:osx-*</exclude>
262+
<exclude>io.netty:netty-tcnative-boringssl-static:*:windows-*</exclude>
263+
<exclude>io.netty:netty-transport-*-kqueue</exclude>
264+
<exclude>io.netty:netty-transport-*-io_uring</exclude>
265+
<exclude>io.netty:netty-transport-native-epoll:*:linux-riscv64</exclude>
266+
</excludes>
258267
</artifactSet>
259268
<filters>
260269
<filter>
@@ -267,6 +276,8 @@
267276
<exclude>META-INF/DEPENDENCIES</exclude>
268277
<exclude>META-INF/LICENSE.txt</exclude>
269278
<exclude>META-INF/NOTICE.txt</exclude>
279+
<exclude>META-INF/license/**</exclude>
280+
<exclude>META-INF/licenses/**</exclude>
270281
<exclude>META-INF/maven/**</exclude>
271282
<exclude>LICENSE.txt</exclude>
272283
<exclude>NOTICE.txt</exclude>
@@ -426,7 +437,7 @@
426437
<echo level="info">renaming netty native libraries</echo>
427438
<move includeemptydirs="false" todir="${project.build.directory}/unpacked/META-INF/native">
428439
<fileset dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
429-
<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>
440+
<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>
430441
</move>
431442
<echo level="info">deleting META-INF/native-image folder</echo>
432443
<delete dir="${project.build.directory}/unpacked/META-INF/native-image"></delete>

kyuubi-ha/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
<artifactId>grpc-util</artifactId>
7373
</dependency>
7474

75+
<dependency>
76+
<groupId>io.netty</groupId>
77+
<artifactId>netty-transport-classes-epoll</artifactId>
78+
</dependency>
79+
7580
<dependency>
7681
<groupId>io.netty</groupId>
7782
<artifactId>netty-transport-native-epoll</artifactId>

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.128.Final</netty.version>
188+
<netty.version>4.2.7.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>
@@ -1895,6 +1895,8 @@
18951895
However, it will not cause problems for use. See: https://github.com/scala/bug/issues/12994
18961896
-->
18971897
<ignoreClass>org.jline.terminal.impl.ffm.*</ignoreClass>
1898+
<!-- Netty io_uring requires JDK9+ -->
1899+
<ignoreClass>io.netty.channel.uring.*</ignoreClass>
18981900
</ignoreClasses>
18991901
</enforceBytecodeVersion>
19001902
</rules>

0 commit comments

Comments
 (0)