This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch release-3.6.0
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/release-3.6.0 by this push:
new f5453c4 ZOOKEEPER-3716: upgrade netty 4.1.42 to address
CVE-2019-20444 CVE-20…
f5453c4 is described below
commit f5453c4d9d9cfbd10ed672e58cb1cc47b3e77970
Author: Patrick Hunt <[email protected]>
AuthorDate: Tue Feb 4 10:35:10 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
Author: Patrick Hunt <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>
Closes #1245 from phunt/ZOOKEEPER-3716
(cherry picked from commit 13c8a35051acbc1f8c3369ed260df2ab22275f58)
Signed-off-by: Enrico Olivelli <[email protected]>
---
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
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4a28cbc..acaeebb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -325,7 +325,7 @@
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
- <netty.version>4.1.42.Final</netty.version>
+ <netty.version>4.1.45.Final</netty.version>
<jetty.version>9.4.24.v20191120</jetty.version>
<jackson.version>2.9.10.2</jackson.version>
<json.version>1.1.1</json.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
