From ba0992693035c97dce5e91b55a3a2b16e01dea43 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Wed, 19 Sep 2018 18:00:42 -0500
Subject: [PATCH] SWS-1040 - Upgrade to latest Spring versions

Introduce another profile and two more CI jobs to verify more combinations of Spring portfolio and Java 8/11.
---
 circle.yml | 26 ++++++++++++++++++++++++--
 pom.xml    | 43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index af8ffc19..e4c7dd3e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,13 +18,22 @@ jobs:
             name: Java 8 - Test Spring.NEXT
             command: ./mvnw -Pspringnext,convergence clean test
 
+   java_8_test_spring_next_buildsnapshot:
+     docker:
+       - image: circleci/openjdk:8u141
+     steps:
+        - checkout
+        - run:
+            name: Java 8 - Test Spring.NEXT (snapshots)
+            command: ./mvnw -Pspringnext-buildsnapshot,convergence clean test
+
    java_8_test_spring_buildsnapshot:
      docker:
        - image: circleci/openjdk:8u141
      steps:
         - checkout
         - run:
-            name: Java 8 - Test Spring.NEXT
+            name: Java 8 - Test Spring (snapshots)
             command: ./mvnw -Pspring-buildsnapshot,convergence clean test
 
    java_11_test_current:
@@ -45,13 +54,22 @@ jobs:
             name: Java 11 - Test Spring.NEXT
             command: ./mvnw -Pspringnext,java11,convergence clean test
 
+   java_11_test_spring_next_buildsnapshot:
+     docker:
+       - image: circleci/openjdk:11-ea-27-jdk-sid
+     steps:
+        - checkout
+        - run:
+            name: Java 11 - Test Spring.NEXT (snapshots)
+            command: ./mvnw -Pspringnext-buildsnapshot,java11,convergence clean test
+
    java_11_test_spring_buildsnapshot:
      docker:
        - image: circleci/openjdk:11-ea-27-jdk-sid
      steps:
         - checkout
         - run:
-            name: Java 11 - Test Spring.NEXT
+            name: Java 11 - Test Spring (snapshots)
             command: ./mvnw -Pspring-buildsnapshot,java11,convergence clean test
 
    deploy:
@@ -72,6 +90,8 @@ workflows:
       - java_11_test_spring_next
       - java_8_test_spring_buildsnapshot
       - java_11_test_spring_buildsnapshot
+      - java_8_test_spring_next_buildsnapshot
+      - java_11_test_spring_next_buildsnapshot
       - deploy:
           requires:
             - java_8_test_current
@@ -80,6 +100,8 @@ workflows:
             - java_11_test_spring_next
             - java_8_test_spring_buildsnapshot
             - java_11_test_spring_buildsnapshot
+            - java_8_test_spring_next_buildsnapshot
+            - java_11_test_spring_next_buildsnapshot
 
 general:
   branches:
diff --git a/pom.xml b/pom.xml
index 99e42d70..0727a569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,8 +209,8 @@
 			<id>spring-buildsnapshot</id>
 			<properties>
 				<aspectj.version>1.9.1</aspectj.version>
-				<spring.version>5.0.9.BUILD-SNAPSHOT</spring.version>
-				<spring-security.version>5.0.8.BUILD-SNAPSHOT</spring-security.version>
+				<spring.version>5.0.10.BUILD-SNAPSHOT</spring.version>
+				<spring-security.version>5.0.9.BUILD-SNAPSHOT</spring-security.version>
 			</properties>
 			<repositories>
 				<repository>
@@ -244,8 +244,43 @@
 			<id>springnext</id>
 			<properties>
 				<aspectj.version>1.9.1</aspectj.version>
-				<spring.version>5.1.0.RC1</spring.version>
-				<spring-security.version>5.1.0.M2</spring-security.version>
+				<spring.version>5.1.0.RC3</spring.version>
+				<spring-security.version>5.1.0.RC2</spring-security.version>
+			</properties>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/snapshot</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-release</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>springnext-buildsnapshot</id>
+			<properties>
+				<aspectj.version>1.9.1</aspectj.version>
+				<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
+				<spring-security.version>5.1.0.BUILD-SNAPSHOT</spring-security.version>
 			</properties>
 			<repositories>
 				<repository>