From 5465afdbcf8bf8b92b6abaf3a416a801f7f07fd1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 22 Aug 2016 15:54:29 +0200
Subject: [PATCH] DATACASS-331 - Include netty as transient dependency of
 cassandra-driver-core.

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 cassandra-all 3.7 and cassandra-driver-core 3.1.0 which both require netty 4.0.37.Final.

Related pull request: #43.
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index beb37e96d..3aa53abeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,10 +102,6 @@
 				<artifactId>cassandra-driver-core</artifactId>
 				<version>${cassandra-driver.version}</version>
 				<exclusions>
-					<exclusion>
-						<groupId>io.netty</groupId>
-						<artifactId>netty-handler</artifactId>
-					</exclusion>
 					<exclusion>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
@@ -151,6 +147,10 @@
 						<artifactId>guava</artifactId>
 						<groupId>com.google.guava</groupId>
 					</exclusion>
+					<exclusion>
+						<groupId>io.netty</groupId>
+						<artifactId>netty-all</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>