This is an automated email from the ASF dual-hosted git repository.
eolivelli 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 c0e7085 ZOOKEEPER-3794: upgrade netty to address CVE-2020-11612
c0e7085 is described below
commit c0e708531c0bfc2f6ef61e5e729c486393a5e3db
Author: Patrick Hunt <[email protected]>
AuthorDate: Wed Apr 15 11:46:41 2020 +0200
ZOOKEEPER-3794: upgrade netty to address CVE-2020-11612
Author: Patrick Hunt <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>
Closes #1320 from phunt/ZOOKEEPER-3794_br35
---
build.xml | 2 +-
pom.xml | 2 +-
...n-4.1.45.Final.LICENSE.txt => netty-buffer-4.1.48.Final.LICENSE.txt} | 0
...ll-4.1.45.Final.LICENSE.txt => netty-codec-4.1.49.Final.LICENSE.txt} | 0
...t-4.1.45.Final.LICENSE.txt => netty-common-4.1.48.Final.LICENSE.txt} | 0
...-4.1.45.Final.LICENSE.txt => netty-handler-4.1.48.Final.LICENSE.txt} | 0
...4.1.45.Final.LICENSE.txt => netty-resolver-4.1.48.Final.LICENSE.txt} | 0
....1.45.Final.LICENSE.txt => netty-transport-4.1.48.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.48.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt} | 0
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index bf01342..bcb2925 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.45.Final"/>
+ <property name="netty.version" value="4.1.48.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 47fe987..ef926c0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,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.45.Final</netty.version>
+ <netty.version>4.1.48.Final</netty.version>
<jackson.version>2.9.10.3</jackson.version>
<json.version>1.1.1</json.version>
<jline.version>2.11</jline.version>
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.49.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.49.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.48.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.45.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.45.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.48.Final.LICENSE.txt
