From 874aaf136ccda2759cc61f4c48ff9d15f6433e07 Mon Sep 17 00:00:00 2001
From: Patrick Hunt <phunt@apache.org>
Date: Thu, 3 Oct 2019 15:39:30 +0200
Subject: [PATCH] ZOOKEEPER-3563: Update Netty to address CVE-2019-16869
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…E-2019-16869 on Netty

Updated netty to 4.1.42.Final to address CVE-2019-16869

Change-Id: Ie95c38a459fb896566ddf7b5df38180bfee7c07c

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 #1103 from phunt/zk3563_trunk
---
 build.xml | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 0d03b4b61ae..ea856ce5b84 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.36.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 3b08b92a17d..9dd967983e3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
     <mockito.version>2.27.0</mockito.version>
     <hamcrest.version>1.3</hamcrest.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <netty.version>4.1.36.Final</netty.version>
+    <netty.version>4.1.42.Final</netty.version>
     <jetty.version>9.4.18.v20190429</jetty.version>
     <jackson.version>2.9.10</jackson.version>
     <json.version>1.1.1</json.version>