From 8859e8493db989ece71a466fe36f75487fe514bb Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Wed, 17 Apr 2019 10:21:36 -0500
Subject: [PATCH] #985 - Stabilize on Spring Framework 5.2.0.M1.

Pin things on stable milestones while introducing a profile to test snapshots. Pipeline updated to build against milestones and snapshots.
---
 ci/pipeline-template.yml | 52 +++++++++++++++++++++++++++++++++++++++-
 pom.xml                  | 15 +++++++++---
 2 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index 65cb769a..88654600 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -137,8 +137,11 @@ groups:
 - name: spring-hateoas
   jobs:
   - test-jdk8
+  - test-spring-next-jdk8
   - test-jdk11
+  - test-spring-next-jdk11
   - test-jdk13
+  - test-spring-next-jdk13
   - build
 - name: spring-hateoas-examples
   jobs:
@@ -174,6 +177,20 @@ jobs:
     params: { PROFILE: "non-existent" }
   <<: *slack-test-failure
 
+- name: test-spring-next-jdk8
+  serial: true
+  public: true
+  plan:
+  - get: spring-hateoas-github
+    trigger: true
+    passed: [ test-jdk8 ]
+  - get: openjdk:8-jdk
+    trigger: true
+  - task: test
+    file: spring-hateoas-github/ci/test.yml
+    params: { PROFILE: "spring-next" }
+  <<: *slack-test-failure
+
 - name: test-jdk11
   serial: true
   public: true
@@ -189,6 +206,21 @@ jobs:
     params: { PROFILE: "non-existant" }
   <<: *slack-test-failure
 
+- name: test-spring-next-jdk11
+  serial: true
+  public: true
+  plan:
+  - get: spring-hateoas-github
+    trigger: true
+    passed: [ test-jdk8 ]
+  - get: openjdk:11-jdk
+    trigger: true
+  - task: test
+    image: openjdk:11-jdk
+    file: spring-hateoas-github/ci/test.yml
+    params: { PROFILE: "spring-next" }
+  <<: *slack-test-failure
+
 - name: test-jdk13
   serial: true
   public: true
@@ -204,6 +236,21 @@ jobs:
     params: { PROFILE: "non-existant" }
   <<: *slack-test-failure
 
+- name: test-spring-next-jdk13
+  serial: true
+  public: true
+  plan:
+  - get: spring-hateoas-github
+    trigger: true
+    passed: [ test-jdk8 ]
+  - get: openjdk:13-jdk
+    trigger: true
+  - task: test
+    image: openjdk:13-jdk
+    file: spring-hateoas-github/ci/test.yml
+    params: { PROFILE: "spring-next" }
+  <<: *slack-test-failure
+
 - name: build
   serial: true
   public: true
@@ -211,8 +258,11 @@ jobs:
   - get: spring-hateoas-github
     trigger: true
     passed: [
+      test-spring-next-jdk8,
       test-jdk11,
-      test-jdk13
+      test-spring-next-jdk11,
+      test-jdk13,
+      test-spring-next-jdk13
     ]
   - get: 8-jdk-with-graphviz:latest
     trigger: true
diff --git a/pom.xml b/pom.xml
index db571c02..d019ffea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,15 +80,24 @@
 		<jsr305.version>3.0.2</jsr305.version>
 		<junit.version>5.4.1</junit.version>
 		<minidevjson.version>2.2.1</minidevjson.version>
-		<reactor-bom.version>Californium-SR4</reactor-bom.version>
+		<reactor-bom.version>Californium-SR6</reactor-bom.version>
 		<slf4j.version>1.7.25</slf4j.version>
-		<spring.version>5.2.0.BUILD-SNAPSHOT</spring.version>
-		<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
+		<spring.version>5.2.0.M1</spring.version>
+		<spring-plugin.version>2.0.0.M1</spring-plugin.version>
 		<kotlin.version>1.3.21</kotlin.version>
 	</properties>
 
 	<profiles>
 
+		<profile>
+			<id>spring-next</id>
+			<properties>
+				<reactor-bom.version>Dysprosium-BUILD-SNAPSHOT</reactor-bom.version>
+				<spring.version>5.2.0.BUILD-SNAPSHOT</spring.version>
+				<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
+			</properties>
+		</profile>
+
 		<profile>
 
 			<!-- Profile to be run on the CI server, JARs JavaDocs -->