[branch-4.16] cherry-pick #4157 #4204 #4224 #4265 update netty and ve…

…rtx (#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 <[email protected]> (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 <[email protected]> Co-authored-by: sullis <[email protected]>
apache · May 28, 2024 · aff2fb6 · aff2fb6
1 parent 504d206
commit aff2fb6
Show file tree

Hide file tree

Showing 8 changed files with 263 additions and 318 deletions.
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
@@ -23,30 +23,31 @@ LongAdder), which was released with the following comments:
     http://creativecommons.org/publicdomain/zero/1.0/
 
 ------------------------------------------------------------------------------------
-- lib/io.netty-netty-buffer-4.1.94.Final.jar
-- lib/io.netty-netty-codec-4.1.94.Final.jar
-- lib/io.netty-netty-codec-dns-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
-- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
-- lib/io.netty-netty-common-4.1.94.Final.jar
-- lib/io.netty-netty-handler-4.1.94.Final.jar
-- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
-- lib/io.netty-netty-resolver-4.1.94.Final.jar
-- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
-- lib/io.netty-netty-transport-4.1.94.Final.jar
-- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
-- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
-- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
+- lib/io.netty-netty-buffer-4.1.108.Final.jar
+- lib/io.netty-netty-codec-4.1.108.Final.jar
+- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
+- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
+- lib/io.netty-netty-common-4.1.108.Final.jar
+- lib/io.netty-netty-handler-4.1.108.Final.jar
+- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
+- lib/io.netty-netty-resolver-4.1.108.Final.jar
+- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
+- lib/io.netty-netty-transport-4.1.108.Final.jar
+- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
 
 
                             The Netty Project

diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
@@ -5,28 +5,29 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------------------
-- lib/io.netty-netty-buffer-4.1.94.Final.jar
-- lib/io.netty-netty-codec-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
-- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
-- lib/io.netty-netty-common-4.1.94.Final.jar
-- lib/io.netty-netty-handler-4.1.94.Final.jar
-- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
-- lib/io.netty-netty-resolver-4.1.94.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
-- lib/io.netty-netty-transport-4.1.94.Final.jar
-- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
-- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
-- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
+- lib/io.netty-netty-buffer-4.1.108.Final.jar
+- lib/io.netty-netty-codec-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
+- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
+- lib/io.netty-netty-common-4.1.108.Final.jar
+- lib/io.netty-netty-handler-4.1.108.Final.jar
+- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
+- lib/io.netty-netty-resolver-4.1.108.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
+- lib/io.netty-netty-transport-4.1.108.Final.jar
+- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
 
 
                             The Netty Project

diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
@@ -5,30 +5,31 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------------------
-- lib/io.netty-netty-buffer-4.1.94.Final.jar
-- lib/io.netty-netty-codec-4.1.94.Final.jar
-- lib/io.netty-netty-codec-dns-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http-4.1.94.Final.jar
-- lib/io.netty-netty-codec-http2-4.1.94.Final.jar
-- lib/io.netty-netty-codec-socks-4.1.94.Final.jar
-- lib/io.netty-netty-common-4.1.94.Final.jar
-- lib/io.netty-netty-handler-4.1.94.Final.jar
-- lib/io.netty-netty-handler-proxy-4.1.94.Final.jar
-- lib/io.netty-netty-resolver-4.1.94.Final.jar
-- lib/io.netty-netty-resolver-dns-4.1.94.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final.jar
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar [11]
-- lib/io.netty-netty-tcnative-classes-2.0.61.Final.jar
-- lib/io.netty-netty-transport-4.1.94.Final.jar
-- lib/io.netty-netty-transport-classes-epoll-4.1.94.Final.jar
-- lib/io.netty-netty-transport-native-epoll-4.1.94.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-x86_64.jar
-- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.21.Final-linux-aarch_64.jar
-- lib/io.netty-netty-transport-native-unix-common-4.1.94.Final.jar
+- lib/io.netty-netty-buffer-4.1.108.Final.jar
+- lib/io.netty-netty-codec-4.1.108.Final.jar
+- lib/io.netty-netty-codec-dns-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http-4.1.108.Final.jar
+- lib/io.netty-netty-codec-http2-4.1.108.Final.jar
+- lib/io.netty-netty-codec-socks-4.1.108.Final.jar
+- lib/io.netty-netty-common-4.1.108.Final.jar
+- lib/io.netty-netty-handler-4.1.108.Final.jar
+- lib/io.netty-netty-handler-proxy-4.1.108.Final.jar
+- lib/io.netty-netty-resolver-4.1.108.Final.jar
+- lib/io.netty-netty-resolver-dns-4.1.108.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-aarch_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-osx-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-boringssl-static-2.0.65.Final-windows-x86_64.jar [11]
+- lib/io.netty-netty-tcnative-classes-2.0.65.Final.jar
+- lib/io.netty-netty-transport-4.1.108.Final.jar
+- lib/io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-x86_64.jar
+- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar
+- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
 
 
                             The Netty Project

diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
@@ -82,7 +82,12 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-      </dependency>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <classifier>linux-aarch_64</classifier>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative-boringssl-static</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -154,9 +154,8 @@
     <log4j.version>2.18.0</log4j.version>
     <lz4.version>1.3.0</lz4.version>
     <mockito.version>3.12.4</mockito.version>
-    <netty.version>4.1.94.Final</netty.version>
-    <netty-boringssl.version>2.0.61.Final</netty-boringssl.version>
-    <netty-iouring.version>0.0.21.Final</netty-iouring.version>
+    <netty.version>4.1.108.Final</netty.version>
+    <netty-iouring.version>0.0.25.Final</netty-iouring.version>
     <ostrich.version>9.1.3</ostrich.version>
     <powermock.version>2.0.9</powermock.version>
     <prometheus.version>0.15.0</prometheus.version>
@@ -174,7 +173,7 @@
     <spotbugs-annotations.version>4.6.0</spotbugs-annotations.version>
     <javax-annotations-api.version>1.3.2</javax-annotations-api.version>
     <testcontainers.version>1.19.4</testcontainers.version>
-    <vertx.version>4.3.8</vertx.version>
+    <vertx.version>4.5.7</vertx.version>
     <zookeeper.version>3.8.3</zookeeper.version>
     <snappy.version>1.1.10.5</snappy.version>
     <jctools.version>2.1.2</jctools.version>
@@ -375,82 +374,12 @@
         </exclusions>
       </dependency>
 
-      <!-- netty dependencies -->
       <dependency>
         <groupId>io.netty</groupId>
-        <artifactId>netty-common</artifactId>
+        <artifactId>netty-bom</artifactId>
         <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-buffer</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-handler</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport-native-epoll</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport-native-epoll</artifactId>
-        <version>${netty.version}</version>
-        <classifier>linux-x86_64</classifier>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-dns</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-http</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-http2</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-codec-socks</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-handler-proxy</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-resolver</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-resolver-dns</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-transport-native-unix-common</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>${netty-boringssl.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>io.netty.incubator</groupId>
@@ -469,6 +398,11 @@
         <version>${netty-iouring.version}</version>
         <classifier>linux-aarch_64</classifier>
       </dependency>
+      <dependency>
+        <groupId>io.netty.incubator</groupId>
+        <artifactId>netty-incubator-transport-classes-io_uring</artifactId>
+        <version>${netty-iouring.version}</version>
+      </dependency>
 
       <!-- grpc dependencies -->
       <dependency>