From 038f3d417777503d645d67285a8349407b51c49a Mon Sep 17 00:00:00 2001
From: Ufuk Celebi <uce@apache.org>
Date: Wed, 23 Sep 2015 16:13:50 +0200
Subject: [PATCH 1/2] [FLINK-2651] Add Netty to dependency management

Hadoop 2.7.0 pulls in an older Netty version, which clashes with our version.
This makes sure to only pull in our version.
---
 flink-runtime/pom.xml | 2 +-
 pom.xml               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 1d98bfd6a3534..11ad1f23bd52e 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -102,7 +102,7 @@ under the License.
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.0.27.Final</version>
+			<!-- Version is set in root POM -->
 		</dependency>
 
 		<!-- See: https://groups.google.com/forum/#!msg/netty/-aAPDBNUnDg/SkGOXL2Ma2QJ -->
diff --git a/pom.xml b/pom.xml
index b5cbc4f9093a4..f6d7376c5c828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,6 +340,12 @@ under the License.
 				<artifactId>zookeeper</artifactId>
 				<version>${zookeeper.version}</version>
 			</dependency>
+
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.0.27.Final</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

From 04b57d04766bc99fca8f705460364ac7ade65711 Mon Sep 17 00:00:00 2001
From: Ufuk Celebi <uce@apache.org>
Date: Wed, 23 Sep 2015 19:58:17 +0200
Subject: [PATCH 2/2] Bump Netty version to 4.0.31.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f6d7376c5c828..6603e81ece67e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,7 +344,7 @@ under the License.
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-all</artifactId>
-				<version>4.0.27.Final</version>
+				<version>4.0.31.Final</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>