This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new 744baab ZOOKEEPER-4272: Upgrade Netty library to > 4.1.60 due to
security vulnerability CVE-2021-21295
744baab is described below
commit 744baabef4724f5f02f6bb0628249a642a4fb80a
Author: Ayush Mantri <[email protected]>
AuthorDate: Wed Mar 31 19:06:44 2021 +0530
ZOOKEEPER-4272: Upgrade Netty library to > 4.1.60 due to security
vulnerability CVE-2021-21295
Upgraded Netty library to 4.1.60
Author: Ayush Mantri <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Mohammad Arshad
<[email protected]>
Closes #1670 from ayushmantri/ZK-4272
---
pom.xml | 2 +-
...n-4.1.59.Final.LICENSE.txt => netty-buffer-4.1.60.Final.LICENSE.txt} | 0
...ll-4.1.59.Final.LICENSE.txt => netty-codec-4.1.60.Final.LICENSE.txt} | 0
...t-4.1.59.Final.LICENSE.txt => netty-common-4.1.60.Final.LICENSE.txt} | 0
...-4.1.59.Final.LICENSE.txt => netty-handler-4.1.60.Final.LICENSE.txt} | 0
...4.1.59.Final.LICENSE.txt => netty-resolver-4.1.60.Final.LICENSE.txt} | 0
....1.59.Final.LICENSE.txt => netty-transport-4.1.60.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.60.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.60.Final.LICENSE.txt} | 0
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b2a983c..6d63b38 100755
--- a/pom.xml
+++ b/pom.xml
@@ -355,7 +355,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.59.Final</netty.version>
+ <netty.version>4.1.60.Final</netty.version>
<jetty.version>9.4.38.v20210224</jetty.version>
<jackson.version>2.10.5.1</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.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.60.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.60.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.60.Final.LICENSE.txt