You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2021/11/27 06:58:28 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-4414: Upgrade to Netty 4.1.70 on branch 3.5
This is an automated email from the ASF dual-hosted git repository.
maoling 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 e0d9ec4 ZOOKEEPER-4414: Upgrade to Netty 4.1.70 on branch 3.5
e0d9ec4 is described below
commit e0d9ec44a9cd76158e575d4318543825f08112ba
Author: Frederiko Costa <fr...@workday.com>
AuthorDate: Sat Nov 27 14:58:21 2021 +0800
ZOOKEEPER-4414: Upgrade to Netty 4.1.70 on branch 3.5
Author: Frederiko Costa <fr...@workday.com>
Reviewers: maoling <ma...@apache.org>
Closes #1776 from frederiko/zookeeper-4414_netty_4.1.70_branch_3.5 and squashes the following commits:
7108f81d3 [Frederiko Costa] Rename license files
04234e757 [Frederiko Costa] Backport ZOOKEEPER-4414 to branch-3.5
---
build.xml | 2 +-
pom.xml | 2 +-
...n-4.1.63.Final.LICENSE.txt => netty-buffer-4.1.70.Final.LICENSE.txt} | 0
...ll-4.1.63.Final.LICENSE.txt => netty-codec-4.1.70.Final.LICENSE.txt} | 0
...t-4.1.63.Final.LICENSE.txt => netty-common-4.1.70.Final.LICENSE.txt} | 0
...-4.1.63.Final.LICENSE.txt => netty-handler-4.1.70.Final.LICENSE.txt} | 0
...4.1.63.Final.LICENSE.txt => netty-resolver-4.1.70.Final.LICENSE.txt} | 0
....1.63.Final.LICENSE.txt => netty-transport-4.1.70.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.70.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt} | 0
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 820eb7d..beb7744 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.63.Final"/>
+ <property name="netty.version" value="4.1.70.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 0e32f6f..c6ddbd4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -298,7 +298,7 @@
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
<jetty.version>9.4.43.v20210629</jetty.version>
- <netty.version>4.1.63.Final</netty.version>
+ <netty.version>4.1.70.Final</netty.version>
<jackson.version>2.10.5.1</jackson.version>
<json.version>1.1.1</json.version>
<jline.version>2.14.6</jline.version>
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt