From 8ee9dfccc911ce4d08492833f7275f4761dabcc5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 12 May 2020 12:40:30 +0200
Subject: [PATCH] #1090 - After release cleanups.

---
 Jenkinsfile    | 19 ++++---------------
 bom/pom.xml    | 42 +++++++++++++++++++++---------------------
 parent/pom.xml |  2 +-
 pom.xml        |  1 -
 4 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1e095531..6e06f98a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -76,7 +76,7 @@ pipeline {
 			}
 		}
 
-		stage('Build project & BOM then release to artifactory') {
+		stage('Build project and release to artifactory') {
 			when {
 				anyOf {
 					branch 'master'
@@ -96,26 +96,15 @@ pipeline {
 				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 			}
 
-			steps {
+			steps {			
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 						"-Dartifactory.staging-repository=libs-snapshot-local " +
-						"-Dartifactory.build-name=spring-data-build-without-bom " +
+						"-Dartifactory.build-name=spring-data-build " +
 						"-Dartifactory.build-number=${BUILD_NUMBER} " +
-						'-Dmaven.test.skip=true clean dependency:tree source:jar javadoc:javadoc javadoc:jar deploy -pl "!bom" -B -U'
-
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom,bom-client -B -U'
-				
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
-						'-Dartifactory.server=https://repo.spring.io ' +
-						"-Dartifactory.username=${ARTIFACTORY_USR} " +
-						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-						"-Dartifactory.staging-repository=libs-snapshot-local " +
-						"-Dartifactory.build-name=spring-data-build-bom " +
-						"-Dartifactory.build-number=${BUILD_NUMBER} " +
-						'-Dmaven.test.skip=true clean deploy -pl bom -B -U'
+						'-Dmaven.test.skip=true clean deploy -B -U'
 			}
 		}
 	}
diff --git a/bom/pom.xml b/bom/pom.xml
index 9cdc2622..001f8bca 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,140 +24,140 @@
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-cassandra</artifactId>
-				<version>3.0.0.RELEASE</version>
+				<version>3.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Commons -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-commons</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Couchbase -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-couchbase</artifactId>
-				<version>4.0.0.RELEASE</version>
+				<version>4.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Elasticsearch -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-elasticsearch</artifactId>
-				<version>4.0.0.RELEASE</version>
+				<version>4.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Gemfire -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-gemfire</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Geode -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-geode</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data JDBC -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jdbc</artifactId>
-				<version>2.0.0.RELEASE</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-relational</artifactId>
-				<version>2.0.0.RELEASE</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data JPA -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data MongoDB -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb</artifactId>
-				<version>3.0.0.RELEASE</version>
+				<version>3.1.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Neo4j -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>
-				<version>5.3.0.RELEASE</version>
+				<version>5.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data R2DBC -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-r2dbc</artifactId>
-				<version>1.1.0.RELEASE</version>
+				<version>1.2.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Redis -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-redis</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data REST -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-webmvc</artifactId>
-				<version>3.3.0.RELEASE</version>
+				<version>3.4.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-core</artifactId>
-				<version>3.3.0.RELEASE</version>
+				<version>3.4.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-hal-browser</artifactId>
-				<version>3.3.0.RELEASE</version>
+				<version>3.4.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest-hal-explorer</artifactId>
-				<version>3.3.0.RELEASE</version>
+				<version>3.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Solr -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-solr</artifactId>
-				<version>4.2.0.RELEASE</version>
+				<version>4.3.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data KeyValue -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-keyvalue</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data Envers -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-envers</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 			<!-- Spring Data LDAP -->
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-ldap</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.4.0-SNAPSHOT</version>
 			</dependency>
 
 		</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1b28a536..d258629d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,7 +132,7 @@
 		<webbeans>2.0.16</webbeans>
 		<javax-annotation-api>1.3.2</javax-annotation-api>
 
-		<releasetrain>Neumann-RELEASE</releasetrain>
+		<releasetrain>Neumann-BUILD-SNAPSHOT</releasetrain>
 
 		<!-- To be overridden by individual modules -->
 		<java-module-name/>
diff --git a/pom.xml b/pom.xml
index a13450fa..d57406b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
 	<modules>
 		<module>resources</module>
 		<module>parent</module>
-		<module>bom</module>
 	</modules>
 
 	<developers>