From 71eee6de314691e5d437bc731bf139d4568e3904 Mon Sep 17 00:00:00 2001
From: David Webb <dwebb@brightmove.com>
Date: Fri, 8 Aug 2014 23:32:32 -0400
Subject: [PATCH] DATACASS-136 - CLOSED - Updated dependencies.

Moved cassandra-all to scope test (left over from DSJD 1.X days)
Newest DSJD
Newest C* 2.0.X
---
 pom.xml                                         |  5 +++--
 spring-cql/pom.xml                              |  3 ++-
 .../config/xml/TestHostStateListener.java       |  5 +++++
 .../integration/config/xml/ppncxct.properties   |  8 ++++----
 spring-data-cassandra/pom.xml                   | 17 +++++++++++++++++
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index ddd236494..c94b83fb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,11 @@
 		<dist.id>spring-data-cassandra</dist.id>
 		<springdata.commons>1.9.0.BUILD-SNAPSHOT</springdata.commons>
 		<cassandra-unit.version>2.0.2.1</cassandra-unit.version>
-		<cassandra-driver-dse.version>2.0.2</cassandra-driver-dse.version>
+		<cassandra-driver-dse>2.0.4</cassandra-driver-dse>
 		<el.version>1.0</el.version>
 		<failsafe.version>2.16</failsafe.version>
 		<jamm.version>0.2.5</jamm.version>
+		<cassandra>2.0.9</cassandra>
 	</properties>
 
 	<developers>
@@ -78,7 +79,7 @@
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-driver-dse</artifactId>
-				<version>${cassandra-driver-dse.version}</version>
+				<version>${cassandra-driver-dse}</version>
 				<exclusions>
 					<exclusion>
 						<artifactId>slf4j-log4j12</artifactId>
diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml
index 09ed0161c..16bc6f3ad 100644
--- a/spring-cql/pom.xml
+++ b/spring-cql/pom.xml
@@ -87,7 +87,8 @@
 		<dependency>
 			<groupId>org.apache.cassandra</groupId>
 			<artifactId>cassandra-all</artifactId>
-			<version>2.0.6</version>
+			<version>${cassandra}</version>
+			<scope>test</scope>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-log4j12</artifactId>
diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
index ba9042db5..8a43a9369 100644
--- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
@@ -49,4 +49,9 @@ public class TestHostStateListener implements StateListener {
 		log.info("Host Removed: " + host.getAddress());
 	}
 
+	@Override
+	public void onSuspected(Host host) {
+		log.info("Host Suspected: " + host.getAddress());
+	}
+
 }
diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
index b8a4b7dd2..acde6caf6 100644
--- a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
@@ -25,9 +25,9 @@ socket.soLinger=5
 socket.tcpNoDelay=false
 local.min.requests=10
 local.max.requests=20
-local.core.connections=30
-local.max.connections=40
+local.core.connections=4
+local.max.connections=8
 remote.min.requests=5
 remote.max.requests=10
-remote.core.connections=15
-remote.max.connections=20
+remote.core.connections=2
+remote.max.connections=4
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 21297f088..70a175bff 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -81,6 +81,23 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.cassandra</groupId>
+			<artifactId>cassandra-all</artifactId>
+			<version>${cassandra}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>