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 20aa632 ZOOKEEPER-4385. Backport ZOOKEEPER-4278 to branch-3.5 to
Address CVE-2021-21409
20aa632 is described below
commit 20aa6328ce308f87470fbb96dd7d12d44ff94886
Author: Brahma Reddy Battula <[email protected]>
AuthorDate: Fri Sep 24 20:25:59 2021 +0530
ZOOKEEPER-4385. Backport ZOOKEEPER-4278 to branch-3.5 to Address
CVE-2021-21409
…2021-21409.
Author: Brahma Reddy Battula <[email protected]>
Reviewers: Mohammad Arshad <[email protected]>
Closes #1762 from brahmareddybattula/branch-3.5
---
build.xml | 2 +-
pom.xml | 2 +-
...n-4.1.60.Final.LICENSE.txt => netty-buffer-4.1.63.Final.LICENSE.txt} | 0
...ll-4.1.60.Final.LICENSE.txt => netty-codec-4.1.63.Final.LICENSE.txt} | 0
...t-4.1.60.Final.LICENSE.txt => netty-common-4.1.63.Final.LICENSE.txt} | 0
...-4.1.60.Final.LICENSE.txt => netty-handler-4.1.63.Final.LICENSE.txt} | 0
...4.1.60.Final.LICENSE.txt => netty-resolver-4.1.63.Final.LICENSE.txt} | 0
....1.60.Final.LICENSE.txt => netty-transport-4.1.63.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.63.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt} | 0
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index bac50f2..fc3fdb7 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.60.Final"/>
+ <property name="netty.version" value="4.1.63.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 a137e6f..a10a8d9 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.39.v20210325</jetty.version>
- <netty.version>4.1.60.Final</netty.version>
+ <netty.version>4.1.63.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.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.63.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.60.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.60.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.63.Final.LICENSE.txt
