From 1534ca41f70bb99afc7b89e007f7cb52045e15a0 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 26 Jan 2016 16:02:26 +0000
Subject: [PATCH] Add dependency management for netty

Fixes gh-710
---
 pom.xml                                   | 11 +++++++++++
 spring-cloud-netflix-core/pom.xml         |  5 -----
 spring-cloud-netflix-dependencies/pom.xml |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index e2eff046..0ec3855a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
 	<properties>
 		<bintray.package>netflix</bintray.package>
 		<main.basedir>${basedir}</main.basedir>
+        <netty.version>4.0.27.Final</netty.version>
 	</properties>
 	<build>
 		<plugins>
@@ -60,6 +61,16 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-codec-http</artifactId>
+				<version>${netty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport-native-epoll</artifactId>
+				<version>${netty.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
 				<artifactId>jackson-dataformat-smile</artifactId>
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index 83e338a7..681f5400 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -39,11 +39,6 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 585a0ee8..ff30f64c 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -6,6 +6,7 @@
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 		<version>1.1.0.BUILD-SNAPSHOT</version>
+        <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
 	<version>1.1.0.BUILD-SNAPSHOT</version>