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 15:47:06 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-4272
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.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 5ee2d3b ZOOKEEPER-4272 ZOOKEEPER-4272: Upgrade Netty library to > 4.1.60 due to security vulnerability CVE-2021-21295
5ee2d3b is described below
commit 5ee2d3baefd6b647f81d92353c69c2e37f60a5f0
Author: Ayush Mantri <aa...@gmail.com>
AuthorDate: Wed Mar 31 21:18:04 2021 +0530
ZOOKEEPER-4272 ZOOKEEPER-4272: Upgrade Netty library to > 4.1.60 due to security vulnerability CVE-2021-21295
Author: Ayush Mantri <aa...@gmail.com>
Reviewers: Mohammad Arshad <ar...@apache.org>
Closes #1671 from ayushmantri/ZK-4272-3.5
---
build.xml | 2 +-
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
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index dad6a6d..04ac6a3 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.59.Final"/>
+ <property name="netty.version" value="4.1.60.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 1ee6692..8b24c58 100755
--- a/pom.xml
+++ b/pom.xml
@@ -298,7 +298,7 @@
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
<jetty.version>9.4.38.v20210224</jetty.version>
- <netty.version>4.1.59.Final</netty.version>
+ <netty.version>4.1.60.Final</netty.version>
<jackson.version>2.10.5.1</jackson.version>
<json.version>1.1.1</json.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