summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederiko Costa <frederiko@gmail.com>2021-02-17 17:22:40 +0000
committerDamien Diederen <ddiederen@apache.org>2021-02-17 17:31:34 +0000
commit7053884432391afe929ab2310c07b1f7ac4fac73 (patch)
tree9c87c6d811fe20216788625da1eeb68773c2d9cc
parent25c3c268653673958eec71cc9925fabc8d377e39 (diff)
downloadzookeeper-7053884432391afe929ab2310c07b1f7ac4fac73.tar.gz
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 <frederiko@gmail.com> Reviewers: Enrico Olivelli <eolivelli@apache.org>, Damien Diederen <ddiederen@apache.org> Closes #1605 from frederiko/netty-4.1.59-update (cherry picked from commit 884fc38db166617e03d03f793ef917febcc131be) Signed-off-by: Damien Diederen <ddiederen@apache.org>
-rwxr-xr-xpom.xml2
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-codec-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-common-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-handler-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-resolver-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-transport-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-native-epoll-4.1.50.Final.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.59.Final.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.50.Final.LICENSE.txt)0
9 files changed, 1 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 0577a2e78..f140a0415 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.35.v20201120</jetty.version>
- <netty.version>4.1.50.Final</netty.version>
+ <netty.version>4.1.59.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-buffer-4.1.50.Final.LICENSE.txt b/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-buffer-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-codec-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-codec-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-common-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-common-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-common-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-handler-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-handler-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-resolver-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-resolver-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-transport-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.50.Final.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/netty-transport-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-transport-native-epoll-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- 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-transport-native-epoll-4.1.59.Final.LICENSE.txt
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-transport-native-unix-common-4.1.59.Final.LICENSE.txt
index 6279e5206..6279e5206 100644
--- 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-transport-native-unix-common-4.1.59.Final.LICENSE.txt