From f83d4bf62d72d8213f0e6689eca6c8034d39dd2c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 22 Aug 2016 11:07:02 +0200
Subject: [PATCH] DATACASS-331 - Include netty as transient dependency of
 cassandra-driver-dse.

Remove the previously added netty dependency exclusion in 237ac88 to include netty as transient dependency. Netty was excluded because of a dependency conflict between cassandra-driver-dse and cassandra-all. The conflict gets visible during build-time on CI hosts with symptoms of 100% CPU usage or network timeouts.

We now use netty 4.0.23.Final (from cassandra-all 2.1.11) during the tests. Users of spring-cql and spring-data-cassandra depend on netty 4.0.27.Final (from of cassandra-driver-dse).

Related pull request: #43.
---
 pom.xml                                       |  5 +--
 spring-cql/pom.xml                            | 33 +++++++++++++++++++
 .../src/test/resources/logback-test.xml       |  2 +-
 spring-data-cassandra/pom.xml                 | 32 ++++++++++++++++++
 4 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cda58cf8..2496f50f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
 		<failsafe.version>2.16</failsafe.version>
 		<jamm.version>0.3.1</jamm.version>
 		<cassandra.version>2.1.11</cassandra.version>
+		<netty.version>4.0.23.Final</netty.version>
 		<cassandra-driver-dse.version>2.1.7.1</cassandra-driver-dse.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
 	</properties>
@@ -108,10 +109,6 @@
 						<artifactId>guava</artifactId>
 						<groupId>com.google.guava</groupId>
 					</exclusion>
-					<exclusion>
-						<artifactId>netty-handler</artifactId>
-						<groupId>io.netty</groupId>
-					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml
index 9737030f8..45920c5a6 100644
--- a/spring-cql/pom.xml
+++ b/spring-cql/pom.xml
@@ -91,8 +91,41 @@
 					<artifactId>guava</artifactId>
 					<groupId>com.google.guava</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>io.netty</groupId>
+					<artifactId>netty-all</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-buffer</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-codec</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
diff --git a/spring-cql/src/test/resources/logback-test.xml b/spring-cql/src/test/resources/logback-test.xml
index 2fdffd95c..3ef1e2718 100644
--- a/spring-cql/src/test/resources/logback-test.xml
+++ b/spring-cql/src/test/resources/logback-test.xml
@@ -17,4 +17,4 @@
 		<appender-ref ref="console" />
 	</root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 4b8b7ce2b..3d0f56ed0 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -99,9 +99,41 @@
 					<artifactId>guava</artifactId>
 					<groupId>com.google.guava</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>io.netty</groupId>
+					<artifactId>netty-all</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-buffer</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-codec</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport</artifactId>
+			<version>${netty.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>