This is an automated email from the ASF dual-hosted git repository.
andor 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 9fce3c3 ZOOKEEPER-3925: Update Netty to 4.1.50Final on 3.5 branch
9fce3c3 is described below
commit 9fce3c3319ee81a017a4ffc833faac660f865174
Author: Enrico Olivelli <[email protected]>
AuthorDate: Thu Sep 3 14:42:59 2020 +0200
ZOOKEEPER-3925: Update Netty to 4.1.50Final on 3.5 branch
- update netty
- fix jline license file
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected]
Closes #1450 from eolivelli/fix/ZOOKEEPER-3925-netty-35
---
build.xml | 2 +-
pom.xml | 2 +-
.../resources/lib/{jline-2.11.LICENSE.txt => jline-2.14.6.LICENSE.txt} | 0
...n-4.1.48.Final.LICENSE.txt => netty-buffer-4.1.50.Final.LICENSE.txt} | 0
...ll-4.1.48.Final.LICENSE.txt => netty-codec-4.1.50.Final.LICENSE.txt} | 0
...t-4.1.48.Final.LICENSE.txt => netty-common-4.1.50.Final.LICENSE.txt} | 0
...-4.1.48.Final.LICENSE.txt => netty-handler-4.1.50.Final.LICENSE.txt} | 0
...4.1.48.Final.LICENSE.txt => netty-resolver-4.1.50.Final.LICENSE.txt} | 0
....1.48.Final.LICENSE.txt => netty-transport-4.1.50.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.50.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt} | 0
11 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 38a1ec5..817b4a1 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.48.Final"/>
+ <property name="netty.version" value="4.1.50.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 81bfbb2..c75b257 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.24.v20191120</jetty.version>
- <netty.version>4.1.48.Final</netty.version>
+ <netty.version>4.1.50.Final</netty.version>
<jackson.version>2.10.3</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/jline-2.11.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/jline-2.11.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt
