This is an automated email from the ASF dual-hosted git repository.
ddiederen pushed a commit to branch branch-3.7.0
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7.0 by this push:
new a99ec37 ZOOKEEPER-4209: Update Netty to 4.1.59.Final
a99ec37 is described below
commit a99ec370c3d10f9f1913f0cb2949413afcb05d9b
Author: Frederiko Costa <[email protected]>
AuthorDate: Wed Feb 17 17:22:40 2021 +0000
ZOOKEEPER-4209: Update Netty to 4.1.59.Final
Update Netty to 4.1.59.Final on to address the vulnerability described at
https://snyk.io/vuln/SNYK-JAVA-IONETTY-1020439
Author: Frederiko Costa <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Damien Diederen
<[email protected]>
Closes #1605 from frederiko/netty-4.1.59-update
(cherry picked from commit 884fc38db166617e03d03f793ef917febcc131be)
Signed-off-by: Damien Diederen <[email protected]>
---
pom.xml | 2 +-
...n-4.1.50.Final.LICENSE.txt => netty-buffer-4.1.59.Final.LICENSE.txt} | 0
...ll-4.1.50.Final.LICENSE.txt => netty-codec-4.1.59.Final.LICENSE.txt} | 0
...t-4.1.50.Final.LICENSE.txt => netty-common-4.1.59.Final.LICENSE.txt} | 0
...-4.1.50.Final.LICENSE.txt => netty-handler-4.1.59.Final.LICENSE.txt} | 0
...4.1.50.Final.LICENSE.txt => netty-resolver-4.1.59.Final.LICENSE.txt} | 0
....1.50.Final.LICENSE.txt => netty-transport-4.1.59.Final.LICENSE.txt} | 0
...ICENSE.txt => netty-transport-native-epoll-4.1.59.Final.LICENSE.txt} | 0
....txt => netty-transport-native-unix-common-4.1.59.Final.LICENSE.txt} | 0
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 887bfc4..df8e5eb 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.50.Final</netty.version>
+ <netty.version>4.1.59.Final</netty.version>
<jetty.version>9.4.35.v20201120</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.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-codec-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-codec-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-common-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-common-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-handler-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-handler-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-resolver-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.59.Final.LICENSE.txt
diff --git
a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.59.Final.LICENSE.txt
similarity index 100%
rename from
zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
rename to
zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.59.Final.LICENSE.txt
