You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/11 14:27:25 UTC
[pulsar] 09/10: Upgrade netty to 4.1.68.Final (#12218)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 68d64792697fa27b134ac4bed8a3919bff385de6
Author: Masahiro Sakamoto <ma...@yahoo-corp.jp>
AuthorDate: Thu Sep 30 00:23:07 2021 +0900
Upgrade netty to 4.1.68.Final (#12218)
(cherry picked from commit 4634b20673d9540f22f0d1a1032a84d5eaf5d311)
---
buildtools/pom.xml | 7 +++++
distribution/server/src/assemble/LICENSE.bin.txt | 36 ++++++++++++------------
pom.xml | 4 +--
pulsar-sql/presto-distribution/LICENSE | 28 +++++++++---------
4 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 46d478e..0161835 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -55,6 +55,13 @@
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.15.0</version>
</dependency>
+ <!-- for testing FastThreadLocalStateCleaner -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>4.1.68.Final</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 02e7b6a..663893c 100644
--- 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.21.jar
- org.apache.commons-commons-lang3-3.6.jar
* Netty
- - 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
+ - io.netty-netty-buffer-4.1.68.Final.jar
+ - io.netty-netty-codec-4.1.68.Final.jar
+ - io.netty-netty-codec-dns-4.1.68.Final.jar
+ - io.netty-netty-codec-http-4.1.68.Final.jar
+ - io.netty-netty-codec-http2-4.1.68.Final.jar
+ - io.netty-netty-codec-socks-4.1.68.Final.jar
+ - io.netty-netty-codec-haproxy-4.1.68.Final.jar
+ - io.netty-netty-common-4.1.68.Final.jar
+ - io.netty-netty-handler-4.1.68.Final.jar
+ - io.netty-netty-handler-proxy-4.1.68.Final.jar
+ - io.netty-netty-resolver-4.1.68.Final.jar
+ - io.netty-netty-resolver-dns-4.1.68.Final.jar
+ - io.netty-netty-transport-4.1.68.Final.jar
+ - io.netty-netty-transport-native-epoll-4.1.68.Final-linux-x86_64.jar
+ - io.netty-netty-transport-native-epoll-4.1.68.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.68.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.42.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
index 5efd579..25dbc38 100644
--- 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.9</zookeeper.version>
- <netty.version>4.1.60.Final</netty.version>
- <netty-tc-native.version>2.0.36.Final</netty-tc-native.version>
+ <netty.version>4.1.68.Final</netty.version>
+ <netty-tc-native.version>2.0.42.Final</netty-tc-native.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<jersey.version>2.31</jersey.version>
<athenz.version>1.10.9</athenz.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 91c1188..d648d20 100644
--- 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.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-buffer-4.1.68.Final.jar
+ - netty-codec-4.1.68.Final.jar
+ - netty-codec-dns-4.1.68.Final.jar
+ - netty-codec-http-4.1.68.Final.jar
+ - netty-codec-haproxy-4.1.68.Final.jar
+ - netty-common-4.1.68.Final.jar
+ - netty-handler-4.1.68.Final.jar
- netty-reactive-streams-2.0.4.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
+ - netty-resolver-4.1.68.Final.jar
+ - netty-resolver-dns-4.1.68.Final.jar
+ - netty-tcnative-boringssl-static-2.0.42.Final.jar
+ - netty-transport-4.1.68.Final.jar
+ - netty-transport-native-epoll-4.1.68.Final-linux-x86_64.jar
+ - netty-transport-native-unix-common-4.1.68.Final.jar
+ - netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
* Joda Time
- joda-time-2.10.5.jar
- joda-time-2.10.1.jar