Skip to content

Commit aff2fb6

Browse files
zhiheng123lhotarisullis
authored
[branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and vertx (#4398)
* Upgrade Netty to 4.1.104.Final and io_uring to 0.0.24.Final (#4157) (cherry-pick from commit 6f5d756) * Use netty-bom for aligning netty library versions, add epoll for linux-aarch_64 (#4204) (cherry-pick from commit bb9da9b) * Upgrade Netty to 4.1.107.Final and io_uring to 0.0.25.Final (#4224) Co-authored-by: ZhangJian He <shoothzj@gmail.com> (cherry-pick from commit 2980935) Conflicts(mockito version): pom.xml * Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 (#4265) - Upgrade vertx-core to 4.5.7 to address CVE-2024-1300 - Depends on merging #4264 before this PR (since Netty 4.1.108.Final is required for vertx-core 4.5.7) (cherry-pick from commit bee9b48) Conflicts(zookeeper version): pom.xml --------- Co-authored-by: Lari Hotari <lhotari@users.noreply.github.com> Co-authored-by: sullis <github@seansullivan.com>
1 parent 504d206 commit aff2fb6

File tree

8 files changed

+263
-318
lines changed

8 files changed

+263
-318
lines changed

‎bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt‎

Lines changed: 60 additions & 59 deletions
Large diffs are not rendered by default.

‎bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt‎

Lines changed: 53 additions & 52 deletions
Large diffs are not rendered by default.

‎bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt‎

Lines changed: 60 additions & 59 deletions
Large diffs are not rendered by default.

‎bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,31 @@ LongAdder), which was released with the following comments:
2323
http://creativecommons.org/publicdomain/zero/1.0/
2424

2525
------------------------------------------------------------------------------------
26-
- lib/io.netty-netty-buffer-4.1.94.Final.jar
27-
- lib/io.netty-netty-codec-4.1.94.Final.jar
28-
- lib/io.netty-netty-codec-dns-4.1.94.Final.jar
29-
- lib/io.netty-netty-codec-http-4.1.94.Final.jar
30-
- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
31-
- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
32-
- lib/io.netty-netty-common-4.1.94.Final.jar
33-
- lib/io.netty-netty-handler-4.1.94.Final.jar
34-
- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
35-
- lib/io.netty-netty-resolver-4.1.94.Final.jar
36-
- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar
37-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
38-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
39-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
40-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
41-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
42-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
43-
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
44-
- lib/io.netty-netty-transport-4.1.94.Final.jar
45-
- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
46-
- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
47-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
48-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
49-
- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
26+
- lib/io.netty-netty-buffer-4.1.108.Final.jar
27+
- lib/io.netty-netty-codec-4.1.108.Final.jar
28+
- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
29+
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
30+
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
31+
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
32+
- lib/io.netty-netty-common-4.1.108.Final.jar
33+
- lib/io.netty-netty-handler-4.1.108.Final.jar
34+
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
35+
- lib/io.netty-netty-resolver-4.1.108.Final.jar
36+
- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
37+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
38+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
39+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
40+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
41+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
42+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
43+
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
44+
- lib/io.netty-netty-transport-4.1.108.Final.jar
45+
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
46+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
47+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
48+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
49+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
50+
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
5051

5152

5253
The Netty Project

‎bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,29 @@ This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
66

77
------------------------------------------------------------------------------------
8-
- lib/io.netty-netty-buffer-4.1.94.Final.jar
9-
- lib/io.netty-netty-codec-4.1.94.Final.jar
10-
- lib/io.netty-netty-codec-http-4.1.94.Final.jar
11-
- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
12-
- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
13-
- lib/io.netty-netty-common-4.1.94.Final.jar
14-
- lib/io.netty-netty-handler-4.1.94.Final.jar
15-
- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
16-
- lib/io.netty-netty-resolver-4.1.94.Final.jar
17-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
18-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
19-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
20-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
21-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
22-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
23-
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
24-
- lib/io.netty-netty-transport-4.1.94.Final.jar
25-
- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
26-
- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
27-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
28-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
29-
- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
8+
- lib/io.netty-netty-buffer-4.1.108.Final.jar
9+
- lib/io.netty-netty-codec-4.1.108.Final.jar
10+
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
11+
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
12+
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
13+
- lib/io.netty-netty-common-4.1.108.Final.jar
14+
- lib/io.netty-netty-handler-4.1.108.Final.jar
15+
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
16+
- lib/io.netty-netty-resolver-4.1.108.Final.jar
17+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
18+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
19+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
20+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
21+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
22+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
23+
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
24+
- lib/io.netty-netty-transport-4.1.108.Final.jar
25+
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
26+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
27+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
28+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
29+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
30+
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
3031

3132

3233
The Netty Project

‎bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,31 @@ This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
66

77
------------------------------------------------------------------------------------
8-
- lib/io.netty-netty-buffer-4.1.94.Final.jar
9-
- lib/io.netty-netty-codec-4.1.94.Final.jar
10-
- lib/io.netty-netty-codec-dns-4.1.94.Final.jar
11-
- lib/io.netty-netty-codec-http-4.1.94.Final.jar
12-
- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
13-
- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
14-
- lib/io.netty-netty-common-4.1.94.Final.jar
15-
- lib/io.netty-netty-handler-4.1.94.Final.jar
16-
- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
17-
- lib/io.netty-netty-resolver-4.1.94.Final.jar
18-
- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar
19-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
20-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
21-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
22-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
23-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
24-
- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
25-
- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
26-
- lib/io.netty-netty-transport-4.1.94.Final.jar
27-
- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
28-
- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
29-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
30-
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
31-
- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
8+
- lib/io.netty-netty-buffer-4.1.108.Final.jar
9+
- lib/io.netty-netty-codec-4.1.108.Final.jar
10+
- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
11+
- lib/io.netty-netty-codec-http-4.1.108.Final.jar
12+
- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
13+
- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
14+
- lib/io.netty-netty-common-4.1.108.Final.jar
15+
- lib/io.netty-netty-handler-4.1.108.Final.jar
16+
- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
17+
- lib/io.netty-netty-resolver-4.1.108.Final.jar
18+
- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
19+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
20+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
21+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
22+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
23+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
24+
- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
25+
- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
26+
- lib/io.netty-netty-transport-4.1.108.Final.jar
27+
- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
28+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
29+
- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
30+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
31+
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
32+
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
3233

3334

3435
The Netty Project

‎bookkeeper-server/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@
8282
<groupId>io.netty</groupId>
8383
<artifactId>netty-transport-native-epoll</artifactId>
8484
<classifier>linux-x86_64</classifier>
85-
</dependency>
85+
</dependency>
86+
<dependency>
87+
<groupId>io.netty</groupId>
88+
<artifactId>netty-transport-native-epoll</artifactId>
89+
<classifier>linux-aarch_64</classifier>
90+
</dependency>
8691
<dependency>
8792
<groupId>io.netty</groupId>
8893
<artifactId>netty-tcnative-boringssl-static</artifactId>

‎pom.xml‎

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@
154154
<log4j.version>2.18.0</log4j.version>
155155
<lz4.version>1.3.0</lz4.version>
156156
<mockito.version>3.12.4</mockito.version>
157-
<netty.version>4.1.94.Final</netty.version>
158-
<netty-boringssl.version>2.0.61.Final</netty-boringssl.version>
159-
<netty-iouring.version>0.0.21.Final</netty-iouring.version>
157+
<netty.version>4.1.108.Final</netty.version>
158+
<netty-iouring.version>0.0.25.Final</netty-iouring.version>
160159
<ostrich.version>9.1.3</ostrich.version>
161160
<powermock.version>2.0.9</powermock.version>
162161
<prometheus.version>0.15.0</prometheus.version>
@@ -174,7 +173,7 @@
174173
<spotbugs-annotations.version>4.6.0</spotbugs-annotations.version>
175174
<javax-annotations-api.version>1.3.2</javax-annotations-api.version>
176175
<testcontainers.version>1.19.4</testcontainers.version>
177-
<vertx.version>4.3.8</vertx.version>
176+
<vertx.version>4.5.7</vertx.version>
178177
<zookeeper.version>3.8.3</zookeeper.version>
179178
<snappy.version>1.1.10.5</snappy.version>
180179
<jctools.version>2.1.2</jctools.version>
@@ -375,82 +374,12 @@
375374
</exclusions>
376375
</dependency>
377376

378-
<!-- netty dependencies -->
379377
<dependency>
380378
<groupId>io.netty</groupId>
381-
<artifactId>netty-common</artifactId>
379+
<artifactId>netty-bom</artifactId>
382380
<version>${netty.version}</version>
383-
</dependency>
384-
<dependency>
385-
<groupId>io.netty</groupId>
386-
<artifactId>netty-buffer</artifactId>
387-
<version>${netty.version}</version>
388-
</dependency>
389-
<dependency>
390-
<groupId>io.netty</groupId>
391-
<artifactId>netty-transport</artifactId>
392-
<version>${netty.version}</version>
393-
</dependency>
394-
<dependency>
395-
<groupId>io.netty</groupId>
396-
<artifactId>netty-handler</artifactId>
397-
<version>${netty.version}</version>
398-
</dependency>
399-
<dependency>
400-
<groupId>io.netty</groupId>
401-
<artifactId>netty-transport-native-epoll</artifactId>
402-
<version>${netty.version}</version>
403-
</dependency>
404-
<dependency>
405-
<groupId>io.netty</groupId>
406-
<artifactId>netty-transport-native-epoll</artifactId>
407-
<version>${netty.version}</version>
408-
<classifier>linux-x86_64</classifier>
409-
</dependency>
410-
<dependency>
411-
<groupId>io.netty</groupId>
412-
<artifactId>netty-codec-dns</artifactId>
413-
<version>${netty.version}</version>
414-
</dependency>
415-
<dependency>
416-
<groupId>io.netty</groupId>
417-
<artifactId>netty-codec-http</artifactId>
418-
<version>${netty.version}</version>
419-
</dependency>
420-
<dependency>
421-
<groupId>io.netty</groupId>
422-
<artifactId>netty-codec-http2</artifactId>
423-
<version>${netty.version}</version>
424-
</dependency>
425-
<dependency>
426-
<groupId>io.netty</groupId>
427-
<artifactId>netty-codec-socks</artifactId>
428-
<version>${netty.version}</version>
429-
</dependency>
430-
<dependency>
431-
<groupId>io.netty</groupId>
432-
<artifactId>netty-handler-proxy</artifactId>
433-
<version>${netty.version}</version>
434-
</dependency>
435-
<dependency>
436-
<groupId>io.netty</groupId>
437-
<artifactId>netty-resolver</artifactId>
438-
<version>${netty.version}</version>
439-
</dependency>
440-
<dependency>
441-
<groupId>io.netty</groupId>
442-
<artifactId>netty-resolver-dns</artifactId>
443-
<version>${netty.version}</version>
444-
</dependency>
445-
<dependency>
446-
<groupId>io.netty</groupId>
447-
<artifactId>netty-transport-native-unix-common</artifactId>
448-
<version>${netty.version}</version>
449-
</dependency>
450-
<dependency>
451-
<groupId>io.netty</groupId>
452-
<artifactId>netty-tcnative-boringssl-static</artifactId>
453-
<version>${netty-boringssl.version}</version>
381+
<type>pom</type>
382+
<scope>import</scope>
454383
</dependency>
455384
<dependency>
456385
<groupId>io.netty.incubator</groupId>
@@ -469,6 +398,11 @@
469398
<version>${netty-iouring.version}</version>
470399
<classifier>linux-aarch_64</classifier>
471400
</dependency>
401+
<dependency>
402+
<groupId>io.netty.incubator</groupId>
403+
<artifactId>netty-incubator-transport-classes-io_uring</artifactId>
404+
<version>${netty-iouring.version}</version>
405+
</dependency>
472406

473407
<!-- grpc dependencies -->
474408
<dependency>

0 commit comments

Comments
 (0)