diff options
author | Frederiko Costa <frederiko.costa@workday.com> | 2021-11-27 14:58:21 +0800 |
---|---|---|
committer | maoling <maoling@apache.org> | 2021-11-27 14:58:21 +0800 |
commit | e0d9ec44a9cd76158e575d4318543825f08112ba (patch) | |
tree | 7ccda43edc627c470b836562dde4d8cdba6f3bf3 | |
parent | c86c03d4675ee36a3880da6ef4edff6f4d7126f0 (diff) | |
download | zookeeper-e0d9ec44a9cd76158e575d4318543825f08112ba.tar.gz |
ZOOKEEPER-4414: Upgrade to Netty 4.1.70 on branch 3.5
Author: Frederiko Costa <frederiko.costa@workday.com>
Reviewers: maoling <maoling@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
-rw-r--r-- | build.xml | 2 | ||||
-rwxr-xr-x | pom.xml | 2 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-codec-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-common-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-handler-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-resolver-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-transport-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt) | 0 | ||||
-rw-r--r-- | zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.70.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt) | 0 |
10 files changed, 2 insertions, 2 deletions
@@ -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"/> @@ -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-buffer-4.1.63.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-buffer-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-codec-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-codec-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-common-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-common-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-handler-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-handler-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-resolver-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-resolver-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-transport-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt +++ b/zookeeper-server/src/main/resources/lib/netty-transport-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-transport-native-epoll-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- 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-transport-native-epoll-4.1.70.Final.LICENSE.txt 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-transport-native-unix-common-4.1.70.Final.LICENSE.txt index 6279e5206..6279e5206 100644 --- 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-transport-native-unix-common-4.1.70.Final.LICENSE.txt |