From d4afb375ccf1bf45a2fe826dddb5d072b0c087da Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 1 Dec 2020 14:23:50 -0600
Subject: [PATCH] Create a branch for 3.1.0.

Resolves #1170.
---
 Jenkinsfile                | 12 +++++++-----
 pom.xml                    |  2 +-
 spring-ws-core/pom.xml     |  2 +-
 spring-ws-security/pom.xml |  2 +-
 spring-ws-support/pom.xml  |  2 +-
 spring-ws-test/pom.xml     |  2 +-
 spring-xml/pom.xml         |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 33b43f4c..a3164318 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -184,11 +184,13 @@ pipeline {
 							returnStdout: true
 					).trim()
 
-					RELEASE_TYPE = 'milestone' // .RC? or .M?
+					RELEASE_TYPE = 'snapshot'
 
-					if (PROJECT_VERSION.endsWith('BUILD-SNAPSHOT')) {
+					if (PROJECT_VERSION.matches(/.*-RC[0-9]+$/) || PROJECT_VERSION.matches(/.*-M[0-9]+$/)) {
+						RELEASE_TYPE = "milestone"
+					} else if (PROJECT_VERSION.endsWith('SNAPSHOT')) {
 						RELEASE_TYPE = 'snapshot'
-					} else if (PROJECT_VERSION.endsWith('RELEASE')) {
+					} else if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
 						RELEASE_TYPE = 'release'
 					}
 
@@ -235,7 +237,7 @@ pipeline {
 							returnStdout: true
 					).trim()
 
-					if (PROJECT_VERSION.endsWith('RELEASE')) {
+					if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
 						unstash name: 'build_info'
 						sh "ci/promote-to-bintray.sh"
 					} else {
@@ -270,7 +272,7 @@ pipeline {
 							returnStdout: true
 					).trim()
 
-					if (PROJECT_VERSION.endsWith('RELEASE')) {
+					if (PROJECT_VERSION.matches(/.*\.[0-9]+$/)) {
 						unstash name: 'build_info'
 						sh "ci/sync-to-maven-central.sh"
 					} else {
diff --git a/pom.xml b/pom.xml
index d6577309..e8f89444 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.ws</groupId>
 	<artifactId>spring-ws</artifactId>
-	<version>3.0.11.BUILD-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Web Services</name>
diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml
index bb17c2ee..40d1e341 100644
--- a/spring-ws-core/pom.xml
+++ b/spring-ws-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>3.0.11.BUILD-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-ws-core</artifactId>
diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml
index 9aee83c2..627b97b2 100644
--- a/spring-ws-security/pom.xml
+++ b/spring-ws-security/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>3.0.11.BUILD-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-ws-security</artifactId>
diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml
index 3923733d..3a39cf53 100644
--- a/spring-ws-support/pom.xml
+++ b/spring-ws-support/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>3.0.11.BUILD-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-ws-support</artifactId>
diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml
index a73b5bcb..bb0473a0 100644
--- a/spring-ws-test/pom.xml
+++ b/spring-ws-test/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>3.0.11.BUILD-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-ws-test</artifactId>
diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml
index b71d3b40..82a84b03 100644
--- a/spring-xml/pom.xml
+++ b/spring-xml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ws</groupId>
 		<artifactId>spring-ws</artifactId>
-		<version>3.0.11.BUILD-SNAPSHOT</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-xml</artifactId>