[improve][misc] Upgrade Netty to 4.1.87.Final (apache#19417)

teaey · Feb 3, 2023 · 27d392d · 27d392d
1 parent 33f40f6
commit 27d392d
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 94 deletions.
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
@@ -48,7 +48,7 @@
     <maven-shade-plugin.version>3.4.0</maven-shade-plugin.version>
     <puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <netty.version>4.1.86.Final</netty.version>
+    <netty.version>4.1.87.Final</netty.version>
     <guice.version>4.2.3</guice.version>
     <guava.version>31.0.1-jre</guava.version>
     <ant.version>1.10.12</ant.version>

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -289,37 +289,37 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-lang3-3.11.jar
     - org.apache.commons-commons-text-1.10.0.jar
  * Netty
-    - io.netty-netty-buffer-4.1.86.Final.jar
-    - io.netty-netty-codec-4.1.86.Final.jar
-    - io.netty-netty-codec-dns-4.1.86.Final.jar
-    - io.netty-netty-codec-http-4.1.86.Final.jar
-    - io.netty-netty-codec-http2-4.1.86.Final.jar
-    - io.netty-netty-codec-socks-4.1.86.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.86.Final.jar
-    - io.netty-netty-common-4.1.86.Final.jar
-    - io.netty-netty-handler-4.1.86.Final.jar
-    - io.netty-netty-handler-proxy-4.1.86.Final.jar
-    - io.netty-netty-resolver-4.1.86.Final.jar
-    - io.netty-netty-resolver-dns-4.1.86.Final.jar
-    - io.netty-netty-resolver-dns-classes-macos-4.1.86.Final.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar
-    - io.netty-netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar
-    - io.netty-netty-transport-4.1.86.Final.jar
-    - io.netty-netty-transport-classes-epoll-4.1.86.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.86.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.86.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
-    - io.netty-netty-tcnative-classes-2.0.54.Final.jar
-    - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.16.Final.jar
-    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
-    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
+    - io.netty-netty-buffer-4.1.87.Final.jar
+    - io.netty-netty-codec-4.1.87.Final.jar
+    - io.netty-netty-codec-dns-4.1.87.Final.jar
+    - io.netty-netty-codec-http-4.1.87.Final.jar
+    - io.netty-netty-codec-http2-4.1.87.Final.jar
+    - io.netty-netty-codec-socks-4.1.87.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.87.Final.jar
+    - io.netty-netty-common-4.1.87.Final.jar
+    - io.netty-netty-handler-4.1.87.Final.jar
+    - io.netty-netty-handler-proxy-4.1.87.Final.jar
+    - io.netty-netty-resolver-4.1.87.Final.jar
+    - io.netty-netty-resolver-dns-4.1.87.Final.jar
+    - io.netty-netty-resolver-dns-classes-macos-4.1.87.Final.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.87.Final-osx-aarch_64.jar
+    - io.netty-netty-resolver-dns-native-macos-4.1.87.Final-osx-x86_64.jar
+    - io.netty-netty-transport-4.1.87.Final.jar
+    - io.netty-netty-transport-classes-epoll-4.1.87.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.87.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.87.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar
+    - io.netty-netty-tcnative-classes-2.0.56.Final.jar
+    - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.17.Final.jar
+    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
+    - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
  * Prometheus client
     - io.prometheus.jmx-collector-0.16.1.jar
     - io.prometheus-simpleclient-0.16.0.jar

diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -348,35 +348,35 @@ The Apache Software License, Version 2.0
     - commons-text-1.10.0.jar
     - commons-compress-1.21.jar
  * Netty
-    - netty-buffer-4.1.86.Final.jar
-    - netty-codec-4.1.86.Final.jar
-    - netty-codec-dns-4.1.86.Final.jar
-    - netty-codec-http-4.1.86.Final.jar
-    - netty-codec-socks-4.1.86.Final.jar
-    - netty-codec-haproxy-4.1.86.Final.jar
-    - netty-common-4.1.86.Final.jar
-    - netty-handler-4.1.86.Final.jar
-    - netty-handler-proxy-4.1.86.Final.jar
-    - netty-resolver-4.1.86.Final.jar
-    - netty-resolver-dns-4.1.86.Final.jar
-    - netty-transport-4.1.86.Final.jar
-    - netty-transport-classes-epoll-4.1.86.Final.jar
-    - netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.86.Final.jar
-    - netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
-    - netty-tcnative-classes-2.0.54.Final.jar
-    - netty-incubator-transport-classes-io_uring-0.0.16.Final.jar
-    - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
-    - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
-    - netty-resolver-dns-classes-macos-4.1.86.Final.jar
-    - netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar
-    - netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar
+    - netty-buffer-4.1.87.Final.jar
+    - netty-codec-4.1.87.Final.jar
+    - netty-codec-dns-4.1.87.Final.jar
+    - netty-codec-http-4.1.87.Final.jar
+    - netty-codec-socks-4.1.87.Final.jar
+    - netty-codec-haproxy-4.1.87.Final.jar
+    - netty-common-4.1.87.Final.jar
+    - netty-handler-4.1.87.Final.jar
+    - netty-handler-proxy-4.1.87.Final.jar
+    - netty-resolver-4.1.87.Final.jar
+    - netty-resolver-dns-4.1.87.Final.jar
+    - netty-transport-4.1.87.Final.jar
+    - netty-transport-classes-epoll-4.1.87.Final.jar
+    - netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.87.Final.jar
+    - netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar
+    - netty-tcnative-classes-2.0.56.Final.jar
+    - netty-incubator-transport-classes-io_uring-0.0.17.Final.jar
+    - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
+    - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
+    - netty-resolver-dns-classes-macos-4.1.87.Final.jar
+    - netty-resolver-dns-native-macos-4.1.87.Final-osx-aarch_64.jar
+    - netty-resolver-dns-native-macos-4.1.87.Final-osx-x86_64.jar
  * Prometheus client
     - simpleclient-0.16.0.jar
     - simpleclient_log4j2-0.16.0.jar

diff --git a/pom.xml b/pom.xml
@@ -133,8 +133,8 @@ flexible messaging model and an intuitive client API.</description>
     <snappy.version>1.1.8.4</snappy.version> <!-- ZooKeeper server -->
     <dropwizardmetrics.version>4.1.12.1</dropwizardmetrics.version> <!-- ZooKeeper server -->
     <curator.version>5.1.0</curator.version>
-    <netty.version>4.1.86.Final</netty.version>
-    <netty-iouring.version>0.0.16.Final</netty-iouring.version>
+    <netty.version>4.1.87.Final</netty.version>
+    <netty-iouring.version>0.0.17.Final</netty-iouring.version>
     <jetty.version>9.4.48.v20220622</jetty.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <jersey.version>2.34</jersey.version>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -231,37 +231,37 @@ The Apache Software License, Version 2.0
     - commons-compress-1.21.jar
     - commons-lang3-3.11.jar
  * Netty
-    - netty-buffer-4.1.86.Final.jar
-    - netty-codec-4.1.86.Final.jar
-    - netty-codec-dns-4.1.86.Final.jar
-    - netty-codec-http-4.1.86.Final.jar
-    - netty-codec-haproxy-4.1.86.Final.jar
-    - netty-codec-socks-4.1.86.Final.jar
-    - netty-handler-proxy-4.1.86.Final.jar
-    - netty-common-4.1.86.Final.jar
-    - netty-handler-4.1.86.Final.jar
+    - netty-buffer-4.1.87.Final.jar
+    - netty-codec-4.1.87.Final.jar
+    - netty-codec-dns-4.1.87.Final.jar
+    - netty-codec-http-4.1.87.Final.jar
+    - netty-codec-haproxy-4.1.87.Final.jar
+    - netty-codec-socks-4.1.87.Final.jar
+    - netty-handler-proxy-4.1.87.Final.jar
+    - netty-common-4.1.87.Final.jar
+    - netty-handler-4.1.87.Final.jar
     - netty-reactive-streams-2.0.6.jar
-    - netty-resolver-4.1.86.Final.jar
-    - netty-resolver-dns-4.1.86.Final.jar
-    - netty-resolver-dns-classes-macos-4.1.86.Final.jar
-    - netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar
-    - netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar
-    - netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar
-    - netty-tcnative-classes-2.0.54.Final.jar
-    - netty-transport-4.1.86.Final.jar
-    - netty-transport-classes-epoll-4.1.86.Final.jar
-    - netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.86.Final.jar
-    - netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar
-    - netty-codec-http2-4.1.86.Final.jar
-    - netty-incubator-transport-classes-io_uring-0.0.16.Final.jar
-    - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
-    - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
+    - netty-resolver-4.1.87.Final.jar
+    - netty-resolver-dns-4.1.87.Final.jar
+    - netty-resolver-dns-classes-macos-4.1.87.Final.jar
+    - netty-resolver-dns-native-macos-4.1.87.Final-osx-aarch_64.jar
+    - netty-resolver-dns-native-macos-4.1.87.Final-osx-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar
+    - netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar
+    - netty-tcnative-classes-2.0.56.Final.jar
+    - netty-transport-4.1.87.Final.jar
+    - netty-transport-classes-epoll-4.1.87.Final.jar
+    - netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.87.Final.jar
+    - netty-transport-native-unix-common-4.1.87.Final-linux-x86_64.jar
+    - netty-codec-http2-4.1.87.Final.jar
+    - netty-incubator-transport-classes-io_uring-0.0.17.Final.jar
+    - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
+    - netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
  * GRPC
     - grpc-api-1.45.1.jar
     - grpc-context-1.45.1.jar

diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml
@@ -62,7 +62,7 @@
   </suppress>
   <suppress>
     <notes><![CDATA[
-   file name: netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
+   file name: netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar
    ]]></notes>
     <packageUrl regex="true">^pkg:maven/io\.netty/netty\-tcnative\-boringssl\-static@.*$</packageUrl>
     <cpe>cpe:/a:chromium_project:chromium</cpe>