Upgrade Netty version to 4.1.60.final (#10073)

Co-authored-by: Ali Ahmed <alia@splunk.com> (cherry picked from commit ae606b9)
apache · Mar 30, 2021 · 8ed886e · 8ed886e
1 parent a23f31c
commit 8ed886e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -357,24 +357,24 @@ The Apache Software License, Version 2.0
     - org.apache.commons-commons-compress-1.19.jar
     - org.apache.commons-commons-lang3-3.6.jar
  * Netty
-    - io.netty-netty-buffer-4.1.51.Final.jar
-    - io.netty-netty-codec-4.1.51.Final.jar
-    - io.netty-netty-codec-dns-4.1.51.Final.jar
-    - io.netty-netty-codec-http-4.1.51.Final.jar
-    - io.netty-netty-codec-http2-4.1.51.Final.jar
-    - io.netty-netty-codec-socks-4.1.51.Final.jar
-    - io.netty-netty-codec-haproxy-4.1.51.Final.jar
-    - io.netty-netty-common-4.1.51.Final.jar
-    - io.netty-netty-handler-4.1.51.Final.jar
-    - io.netty-netty-handler-proxy-4.1.51.Final.jar
-    - io.netty-netty-resolver-4.1.51.Final.jar
-    - io.netty-netty-resolver-dns-4.1.51.Final.jar
-    - io.netty-netty-transport-4.1.51.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
-    - io.netty-netty-transport-native-epoll-4.1.51.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.51.Final.jar
-    - io.netty-netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar
-    - io.netty-netty-tcnative-boringssl-static-2.0.33.Final.jar
+    - io.netty-netty-buffer-4.1.60.Final.jar
+    - io.netty-netty-codec-4.1.60.Final.jar
+    - io.netty-netty-codec-dns-4.1.60.Final.jar
+    - io.netty-netty-codec-http-4.1.60.Final.jar
+    - io.netty-netty-codec-http2-4.1.60.Final.jar
+    - io.netty-netty-codec-socks-4.1.60.Final.jar
+    - io.netty-netty-codec-haproxy-4.1.60.Final.jar
+    - io.netty-netty-common-4.1.60.Final.jar
+    - io.netty-netty-handler-4.1.60.Final.jar
+    - io.netty-netty-handler-proxy-4.1.60.Final.jar
+    - io.netty-netty-resolver-4.1.60.Final.jar
+    - io.netty-netty-resolver-dns-4.1.60.Final.jar
+    - io.netty-netty-transport-4.1.60.Final.jar
+    - io.netty-netty-transport-native-epoll-4.1.60.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.60.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.60.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.60.Final-linux-x86_64.jar
+    - io.netty-netty-tcnative-boringssl-static-2.0.36.Final.jar
  * Prometheus client
     - io.prometheus-simpleclient-0.5.0.jar
     - io.prometheus-simpleclient_common-0.5.0.jar

diff --git a/pom.xml b/pom.xml
@@ -100,8 +100,8 @@ flexible messaging model and an intuitive client API.</description>
 
     <bookkeeper.version>4.12.0</bookkeeper.version>
     <zookeeper.version>3.5.7</zookeeper.version>
-    <netty.version>4.1.51.Final</netty.version>
-    <netty-tc-native.version>2.0.33.Final</netty-tc-native.version>
+    <netty.version>4.1.60.Final</netty.version>
+    <netty-tc-native.version>2.0.36.Final</netty-tc-native.version>
     <jetty.version>9.4.35.v20201120</jetty.version>
     <jersey.version>2.31</jersey.version>
     <athenz.version>1.8.38</athenz.version>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -233,21 +233,21 @@ The Apache Software License, Version 2.0
     - commons-lang3-3.6.jar
  * Netty
     - netty-3.10.6.Final.jar
-    - netty-buffer-4.1.51.Final.jar
-    - netty-codec-4.1.51.Final.jar
-    - netty-codec-dns-4.1.51.Final.jar
-    - netty-codec-http-4.1.51.Final.jar
-    - netty-codec-haproxy-4.1.51.Final.jar
-    - netty-common-4.1.51.Final.jar
-    - netty-handler-4.1.51.Final.jar
+    - netty-buffer-4.1.60.Final.jar
+    - netty-codec-4.1.60.Final.jar
+    - netty-codec-dns-4.1.60.Final.jar
+    - netty-codec-http-4.1.60.Final.jar
+    - netty-codec-haproxy-4.1.60.Final.jar
+    - netty-common-4.1.60.Final.jar
+    - netty-handler-4.1.60.Final.jar
     - netty-reactive-streams-2.0.4.jar
-    - netty-resolver-4.1.51.Final.jar
-    - netty-resolver-dns-4.1.51.Final.jar
-    - netty-tcnative-boringssl-static-2.0.33.Final.jar
-    - netty-transport-4.1.51.Final.jar
-    - netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar
-    - netty-transport-native-unix-common-4.1.51.Final.jar
-    - netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar
+    - netty-resolver-4.1.60.Final.jar
+    - netty-resolver-dns-4.1.60.Final.jar
+    - netty-tcnative-boringssl-static-2.0.36.Final.jar
+    - netty-transport-4.1.60.Final.jar
+    - netty-transport-native-epoll-4.1.60.Final-linux-x86_64.jar
+    - netty-transport-native-unix-common-4.1.60.Final.jar
+    - netty-transport-native-unix-common-4.1.60.Final-linux-x86_64.jar
  * Joda Time
     - joda-time-2.10.5.jar
     - joda-time-2.10.1.jar