You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ar...@apache.org on 2021/03/31 13:32:34 UTC
[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4272: Upgrade
Netty library to > 4.1.60 due to security vulnerability CVE-2021-21295
This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7 by this push:
new 97d0ad0 ZOOKEEPER-4272: Upgrade Netty library to > 4.1.60 due to security vulnerability CVE-2021-21295
97d0ad0 is described below
commit 97d0ad0a0cd87847878af87b21259be0098a3124
Author: Ayush Mantri <aa...@gmail.com>
AuthorDate: Wed Mar 31 19:04:23 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 <aa...@gmail.com>
Reviewers: Enrico Olivelli <eo...@apache.org>, Mohammad Arshad <ar...@apache.org>
Closes #1669 from ayushmantri/ZOOKEEPER-4272
(cherry picked from commit 9213f7353b1e6ce4d0fdbc1dca963ace1fd32cec)
Signed-off-by: Mohammad Arshad <ar...@apache.org>
---
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 df55d94..0f96ae3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -437,7 +437,7 @@
<mockito.version>3.6.28</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<commons-cli.version>1.4</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>
<jline.version>2.14.6</jline.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