From 3c80b2cb808ea56fc1df1427d07af68a97454f4e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 13 Sep 2016 17:42:56 +0200
Subject: [PATCH] DATACASS-329 - Set up 2.0 development.

---
 pom.xml                                           |  9 ++++-----
 spring-cql/pom.xml                                | 15 ++++++++++-----
 spring-data-cassandra-distribution/pom.xml        |  2 +-
 spring-data-cassandra/pom.xml                     | 12 ++++++++++--
 .../convert/MappingCassandraConverter.java        |  4 ++--
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index c26cb4405..e30b17c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-cassandra-parent</artifactId>
-	<version>1.5.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data for Apache Cassandra</name>
@@ -76,8 +76,7 @@
 		<failsafe.version>2.16</failsafe.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
 		<project.type>multi</project.type>
-		<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
-		<assertj>3.5.2</assertj>
+		<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
 	</properties>
 
 	<repositories>
@@ -186,7 +185,7 @@
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-validator</artifactId>
-				<version>4.2.0.Final</version>
+				<version>5.2.4.Final</version>
 				<scope>test</scope>
 			</dependency>
 
diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml
index 1f09198d8..bca830045 100644
--- a/spring-cql/pom.xml
+++ b/spring-cql/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-cassandra-parent</artifactId>
-		<version>1.5.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -18,10 +18,6 @@
 	<description>Raw Cassandra CQL Support for Spring Core</description>
 	<url>https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-cql</url>
 
-	<properties>
-		<validation>1.0.0.GA</validation>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -48,6 +44,15 @@
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
 		</dependency>
+
+		<!-- Reactor -->
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>${reactor}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>com.datastax.cassandra</groupId>
 			<artifactId>cassandra-driver-core</artifactId>
diff --git a/spring-data-cassandra-distribution/pom.xml b/spring-data-cassandra-distribution/pom.xml
index cb8750f75..9a9015516 100644
--- a/spring-data-cassandra-distribution/pom.xml
+++ b/spring-data-cassandra-distribution/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-cassandra-parent</artifactId>
-		<version>1.5.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 207a2fa11..fe4138104 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-cassandra-parent</artifactId>
-		<version>1.5.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -19,7 +19,7 @@
 	<url>https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-data-cassandra</url>
 
 	<properties>
-		<validation>1.0.0.GA</validation>
+		<validation>1.1.0.Final</validation>
 	</properties>
 
 	<dependencies>
@@ -71,6 +71,14 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Reactor -->
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>${reactor}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
index d0075c247..2520976aa 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
@@ -471,8 +471,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
 		CassandraPersistentProperty idProperty = entity.getIdProperty();
 
 		if (idProperty != null) {
-			return accessor.getProperty(idProperty, idProperty.isCompositePrimaryKey() ? idProperty.getType()
-					: getCodec(idProperty).getJavaType().getRawType());
+			return accessor.getProperty(idProperty, (Class<?>) (idProperty.isCompositePrimaryKey() ? idProperty.getType()
+					: getCodec(idProperty).getJavaType().getRawType()));
 		}
 
 		// if the class doesn't have an id property, then it's using MapId