This is an automated email from the ASF dual-hosted git repository.
zhaocong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new d98374ca7af [cherry-pick][branch-2.9] Upgrade Netty to 4.1.87.Final
(#19417) (#19718)
d98374ca7af is described below
commit d98374ca7af554edfb0d32a3582db3fc71c31a35
Author: Cong Zhao <[email protected]>
AuthorDate: Thu Mar 9 18:42:07 2023 +0800
[cherry-pick][branch-2.9] Upgrade Netty to 4.1.87.Final (#19417) (#19718)
Co-authored-by: Lari Hotari <[email protected]>
---
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 50 +++++++++++-----------
pom.xml | 4 +-
.../coordination/impl/LeaderElectionImplTest.java | 2 +-
pulsar-sql/presto-distribution/LICENSE | 46 ++++++++++----------
5 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index aa9e0f9882b..1198bcc7de9 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -101,7 +101,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.77.Final</version>
+ <version>4.1.87.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 946d605cefd..596412be69d 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -352,31 +352,31 @@ The Apache Software License, Version 2.0
- org.apache.commons-commons-compress-1.21.jar
- org.apache.commons-commons-lang3-3.11.jar
* Netty
- - io.netty-netty-buffer-4.1.77.Final.jar
- - io.netty-netty-codec-4.1.77.Final.jar
- - io.netty-netty-codec-dns-4.1.77.Final.jar
- - io.netty-netty-codec-http-4.1.77.Final.jar
- - io.netty-netty-codec-http2-4.1.77.Final.jar
- - io.netty-netty-codec-socks-4.1.77.Final.jar
- - io.netty-netty-codec-haproxy-4.1.77.Final.jar
- - io.netty-netty-common-4.1.77.Final.jar
- - io.netty-netty-handler-4.1.77.Final.jar
- - io.netty-netty-handler-proxy-4.1.77.Final.jar
- - io.netty-netty-resolver-4.1.77.Final.jar
- - io.netty-netty-resolver-dns-4.1.77.Final.jar
- - io.netty-netty-transport-4.1.77.Final.jar
- - io.netty-netty-transport-classes-epoll-4.1.77.Final.jar
- - io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- - io.netty-netty-transport-native-epoll-4.1.77.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.77.Final.jar
- - io.netty-netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar
- - io.netty-netty-tcnative-classes-2.0.52.Final.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-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
* 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 191f55d9586..4fb4b7e1458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,8 @@ flexible messaging model and an intuitive client
API.</description>
<snappy.version>1.1.7</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>3.2.5</dropwizardmetrics.version> <!--
ZooKeeper server -->
<curator.version>5.1.0</curator.version>
- <netty.version>4.1.77.Final</netty.version>
- <netty-tc-native.version>2.0.52.Final</netty-tc-native.version>
+ <netty.version>4.1.87.Final</netty.version>
+ <netty-tc-native.version>2.0.56.Final</netty-tc-native.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-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
index 027521d2ffc..8f70ab51958 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index d1fcc6988be..90cd9932ec1 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -232,30 +232,30 @@ The Apache Software License, Version 2.0
- commons-lang3-3.11.jar
* Netty
- netty-3.10.6.Final.jar
- - netty-buffer-4.1.77.Final.jar
- - netty-codec-4.1.77.Final.jar
- - netty-codec-dns-4.1.77.Final.jar
- - netty-codec-http-4.1.77.Final.jar
- - netty-codec-haproxy-4.1.77.Final.jar
- - netty-codec-socks-4.1.77.Final.jar
- - netty-handler-proxy-4.1.77.Final.jar
- - netty-common-4.1.77.Final.jar
- - netty-handler-4.1.77.Final.jar
+ - netty-buffer-4.1.787.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.77.Final.jar
- - netty-resolver-dns-4.1.77.Final.jar
- - netty-tcnative-boringssl-static-2.0.52.Final.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar
- - netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar
- - netty-tcnative-classes-2.0.52.Final.jar
- - netty-transport-4.1.77.Final.jar
- - netty-transport-classes-epoll-4.1.77.Final.jar
- - netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar
- - netty-transport-native-unix-common-4.1.77.Final.jar
- - netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar
+ - netty-resolver-4.1.87.Final.jar
+ - netty-resolver-dns-4.1.87.Final.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
* Joda Time
- joda-time-2.10.5.jar
* Jetty
