This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new fc1764b ZOOKEEPER-4454: Upgrade Netty to 4.1.73
fc1764b is described below
commit fc1764bc976b3c57404686a4b4a69ec154c561c6
Author: Enrico Olivelli <[email protected]>
AuthorDate: Mon Jan 31 16:13:34 2022 +0000
ZOOKEEPER-4454: Upgrade Netty to 4.1.73
(cherry picked from commit d45d5df963cc3f7641d6dec2920bb22cfe8d0a76)
Author: Enrico Olivelli <[email protected]>
Reviewers: Mate Szalay-Beko <[email protected]>
Closes #1809 from eolivelli/ZOOKEEPER-4454-branch-35
---
build.xml | 2 +-
pom.xml | 1 +
...n-4.1.70.Final.LICENSE.txt => netty-buffer-4.1.73.Final.LICENSE.txt} | 0
...ll-4.1.70.Final.LICENSE.txt => netty-codec-4.1.73.Final.LICENSE.txt} | 0
...t-4.1.70.Final.LICENSE.txt => netty-common-4.1.73.Final.LICENSE.txt} | 0
...-4.1.70.Final.LICENSE.txt => netty-handler-4.1.73.Final.LICENSE.txt} | 0
...4.1.70.Final.LICENSE.txt => netty-resolver-4.1.73.Final.LICENSE.txt} | 0
....1.70.Final.LICENSE.txt => netty-transport-4.1.73.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.73.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt} | 0
10 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 7c887a3..85f3ae4 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<property name="audience-annotations.version" value="0.5.0" />
- <property name="netty.version" value="4.1.70.Final"/>
+ <property name="netty.version" value="4.1.73.Final"/>
<property name="junit.version" value="4.12"/>
<property name="mockito.version" value="2.27.0"/>
diff --git a/pom.xml b/pom.xml
index fe430cf..4b9a580 100755
--- a/pom.xml
+++ b/pom.xml
@@ -297,6 +297,7 @@
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
+ <netty.version>4.1.73.Final</netty.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<netty.version>4.1.70.Final</netty.version>
<jackson.version>2.13.1</jackson.version>
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.73.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.73.Final.LICENSE.txt
