This is an automated email from the ASF dual-hosted git repository.
nkalmar pushed a commit to branch branch-3.5.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5.7 by this push:
new 1c5d1a7 ZOOKEEPER-3716: upgrade netty 4.1.42 to address
CVE-2019-20444 CVE-20…
1c5d1a7 is described below
commit 1c5d1a7004b06313af032970c2c554b2c64217b9
Author: Patrick Hunt <[email protected]>
AuthorDate: Sun Feb 9 14:48:03 2020 +0100
ZOOKEEPER-3716: upgrade netty 4.1.42 to address CVE-2019-20444 CVE-20…
…19-20445
Updated netty to version 4.1.45 to address CVE-2019-20444 CVE-2019-20445
Change-Id: Iabcbd1f0b75a03d2a555084de841d7f8caedf6bd
(cherry picked from commit c3f6d4627579e3ee1a25a7c3f08ceb261eee5af1)
Author: Patrick Hunt <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Norbert Kalmar
<[email protected]>
Closes #1246 from phunt/ZOOKEEPER-3716_br35
(cherry picked from commit b3adc29f9c4bf1ed3f05dbac0aa5b597a6ca2fd9)
Signed-off-by: Norbert Kalmar <[email protected]>
---
build.xml | 2 +-
pom.xml | 2 +-
...n-4.1.42.Final.LICENSE.txt => netty-buffer-4.1.45.Final.LICENSE.txt} | 0
...ll-4.1.42.Final.LICENSE.txt => netty-codec-4.1.45.Final.LICENSE.txt} | 0
...t-4.1.42.Final.LICENSE.txt => netty-common-4.1.45.Final.LICENSE.txt} | 0
...-4.1.42.Final.LICENSE.txt => netty-handler-4.1.45.Final.LICENSE.txt} | 0
...4.1.42.Final.LICENSE.txt => netty-resolver-4.1.45.Final.LICENSE.txt} | 0
....1.42.Final.LICENSE.txt => netty-transport-4.1.45.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.45.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.45.Final.LICENSE.txt} | 0
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index f6bb9bb..cde620e 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.42.Final"/>
+ <property name="netty.version" value="4.1.45.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 786ca7b..5aa2556 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.42.Final</netty.version>
+ <netty.version>4.1.45.Final</netty.version>
<jackson.version>2.9.10.2</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.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.45.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.42.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.45.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.42.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.45.Final.LICENSE.txt
