summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Hunt <phunt@apache.org>2019-10-03 15:41:41 +0200
committerNorbert Kalmar <nkalmar@apache.org>2019-10-03 15:42:03 +0200
commit3433841cb8e8ed1e1a3ef65e6e986aae3de55677 (patch)
tree39eae52a3f01a83eb8f5d04a8b9d9f7bf3a93482
parent7e5ffe700e8580238c49b7e3f9b0ca54bad29a5a (diff)
downloadzookeeper-3433841cb8e8ed1e1a3ef65e6e986aae3de55677.tar.gz
ZOOKEEPER-3563: Update Netty to fix CVE-2019-16869release-3.5.6-rc3
…E-2019-16869 on Netty Updated netty to 4.1.42.Final to address CVE-2019-16869 Change-Id: Ia14d695815143cdfcda1d2efcc0d83211cb356dd Author: Patrick Hunt <phunt@apache.org> Reviewers: Enrico Olivelli <eolivelli@apache.org>, Norbert Kalmar <nkalmar@apache.org>, Brian Nixon <brian.nixon.cs@gmail.com Closes #1102 from phunt/zk3563_br35 (cherry picked from commit 82b04e852aa46917274964d01565be931353248f) Signed-off-by: Norbert Kalmar <nkalmar@apache.org>
-rw-r--r--build.xml2
-rwxr-xr-xpom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 21ed6a18d..edb3acea2 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.29.Final"/>
+ <property name="netty.version" value="4.1.42.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 891373f63..068f21196 100755
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
<jetty.version>9.4.17.v20190418</jetty.version>
- <netty.version>4.1.29.Final</netty.version>
+ <netty.version>4.1.42.Final</netty.version>
<jackson.version>2.9.10</jackson.version>
<json.version>1.1.1</json.version>
<jline.version>2.11</jline.version>