From 84b811fd4330cc4c5c4533bcef0049f25459821b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 5 Aug 2019 15:35:05 +0200
Subject: [PATCH] #835 - Prepare 2.2 RC2 (Moore).

---
 bom/pom.xml    | 40 ++++++++++++++++++++--------------------
 parent/pom.xml | 13 +++++--------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index e795c5eb..4639f0f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,133 +24,133 @@
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-cassandra</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Commons -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-commons</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Couchbase -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-couchbase</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Elasticsearch -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-elasticsearch</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Gemfire -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-gemfire</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Geode -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-geode</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data JDBC -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jdbc</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.RC2</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-relational</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data JPA -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data MongoDB -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Neo4j -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>
-				<version>5.2.0.BUILD-SNAPSHOT</version>
+				<version>5.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Redis -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-redis</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data REST -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-webmvc</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-core</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-hal-browser</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-hal-explorer</artifactId>
-				<version>3.2.0.BUILD-SNAPSHOT</version>
+				<version>3.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Solr -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-solr</artifactId>
-				<version>4.1.0.BUILD-SNAPSHOT</version>
+				<version>4.1.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data KeyValue -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-keyvalue</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data Envers -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-envers</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 			<!-- Spring Data LDAP -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-ldap</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.RC2</version>
 			</dependency>
 
 		</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6940bd53..75d488b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,7 @@
 		<webbeans>2.0.11</webbeans>
 		<javax-annotation-api>1.3</javax-annotation-api>
 
-		<releasetrain>Moore-BUILD-SNAPSHOT</releasetrain>
+		<releasetrain>Moore-RC2</releasetrain>
 
 		<!-- To be overridden by individual modules -->
 		<java-module-name/>
@@ -200,8 +200,7 @@
 
 									<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
 										<!-- XML requires double escaping, config gets XML-processed twice -->
-										<property name="whitelist"
-												  value="http://www\.querydsl\.com.*&amp;#10;http://www\.prowaveconsulting\.com.*&amp;#10;http://www\.scispike\.com.*&amp;#10;http://.*.icu-project\.org.*"/>
+										<property name="whitelist" value="http://www\.querydsl\.com.*&amp;#10;http://www\.prowaveconsulting\.com.*&amp;#10;http://www\.scispike\.com.*&amp;#10;http://.*.icu-project\.org.*"/>
 									</module>
 								</module>
 							</checkstyleRules>
@@ -324,7 +323,7 @@
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>2.2.0.BUILD-SNAPSHOT</version>
+					<version>2.2.0.RC2</version>
 					<type>zip</type>
 					<optional>true</optional>
 				</dependency>
@@ -765,10 +764,8 @@
 								<configuration>
 									<target>
 										<copy todir="${project.root}/target/schemas">
-											<fileset dir="${basedir}"
-													 erroronmissingdir="false">
-												<include
-														name="**/src/main/resources/**/config/spring-*.xsd"/>
+											<fileset dir="${basedir}" erroronmissingdir="false">
+												<include name="**/src/main/resources/**/config/spring-*.xsd"/>
 											</fileset>
 											<flattenmapper/>
 										</copy>