From b735dfe351105ebe07bc9445caf387b8f12488b9 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 7 Jun 2016 12:18:19 +0200
Subject: [PATCH] #246 - Prepared branch for 2.0 development.

Pulled up version number to 2.0 snapshots. Upgraded compiler source level to Java 8. Removed Bundlor. Added version placeholder for Reactor and Spring Reactive. Upgraded to Spring Framework 4.2.6 and Spring HATEOAS 0.20. Coined release train name Kay.
---
 bom/pom.xml       | 40 ++++++++++++++++++++--------------------
 parent/pom.xml    | 43 ++++++++-----------------------------------
 pom.xml           |  2 +-
 resources/pom.xml |  4 ++--
 4 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 57e318e9..f20650fc 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-releasetrain</artifactId>
-	<version>Ingalls-BUILD-SNAPSHOT</version>
+	<version>Kay-BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-build</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<name>Spring Data Release Train - BOM</name>
@@ -24,116 +24,116 @@
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-cql</artifactId>
-				<version>1.5.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-cassandra</artifactId>
-				<version>1.5.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Commons -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-commons</artifactId>
-				<version>1.13.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Couchbase -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-couchbase</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>3.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Elasticsearch -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-elasticsearch</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>3.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Gemfire -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-gemfire</artifactId>
-				<version>1.9.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data JPA -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
-				<version>1.11.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data MongoDB -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb</artifactId>
-				<version>1.10.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb-cross-store</artifactId>
-				<version>1.10.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb-log4j</artifactId>
-				<version>1.10.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Neo4j -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>
-				<version>4.2.0.BUILD-SNAPSHOT</version>
+				<version>5.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Redis -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-redis</artifactId>
-				<version>1.8.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data REST -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-webmvc</artifactId>
-				<version>2.6.0.BUILD-SNAPSHOT</version>
+				<version>3.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-core</artifactId>
-				<version>2.6.0.BUILD-SNAPSHOT</version>
+				<version>3.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-hal-browser</artifactId>
-				<version>2.6.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Solr -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-solr</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>3.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data KeyValue -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-keyvalue</artifactId>
-				<version>1.2.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Envers -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-envers</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 
 		</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index ab34b0df..ca2a8a11 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -26,14 +26,14 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-build</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data Build - General parent module</name>
 	<description>Global parent pom.xml to be used by Spring Data modules</description>
 	<url>http://www.spring.io/spring-data</url>
-	<inceptionYear>2011-2015</inceptionYear>
+	<inceptionYear>2011-2016</inceptionYear>
 
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -79,11 +79,9 @@
 
 	<properties>
 
-		<bundlor.enabled>true</bundlor.enabled>
-		<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.root>${basedir}</project.root>
-		<source.level>1.6</source.level>
+		<source.level>1.8</source.level>
 		<dist.id>${project.artifactId}</dist.id>
 		<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
 
@@ -102,6 +100,7 @@
 		<lombok>1.16.10</lombok>
 		<mockito>1.10.19</mockito>
 		<querydsl>4.1.3</querydsl>
+		<reactor>2.5.0.M3</reactor>
 		<rxjava>1.1.8</rxjava>
 		<slf4j>1.7.21</slf4j>
 		<spring>4.2.7.RELEASE</spring>
@@ -110,7 +109,7 @@
 		<validation>1.0.0.GA</validation>
 		<webbeans>1.2.8</webbeans>
 
-		<releasetrain>Ingalls-BUILD-SNAPSHOT</releasetrain>
+		<releasetrain>Kay-BUILD-SNAPSHOT</releasetrain>
 
 	</properties>
 
@@ -193,7 +192,7 @@
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>1.9.0.BUILD-SNAPSHOT</version>
+					<version>2.0.0.BUILD-SNAPSHOT</version>
 					<scope>provided</scope>
 					<type>zip</type>
 				</dependency>
@@ -671,12 +670,6 @@
 
 			<plugins>
 
-				<plugin>
-					<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>1.0.0.RELEASE</version>
-				</plugin>
-
 				<plugin>
 					<groupId>org.asciidoctor</groupId>
 					<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -795,23 +788,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-				<configuration>
-					<enabled>${bundlor.enabled}</enabled>
-					<failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
-				</configuration>
-				<executions>
-					<execution>
-						<id>bundlor</id>
-						<goals>
-							<goal>bundlor</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -839,11 +815,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
+			<id>spring-libs-snapshot</id>
+			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 
diff --git a/pom.xml b/pom.xml
index 8c2c6287..1a13ea68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.data.build</groupId>
 	<artifactId>spring-data-build</artifactId>
-	<version>1.9.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Build</name>
diff --git a/resources/pom.xml b/resources/pom.xml
index 3507c2ad..aa49f042 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,11 +4,11 @@
 
 	<artifactId>spring-data-build-resources</artifactId>
 	<packaging>pom</packaging>
-	
+
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-build</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>