From e3f973aeec1759767c85cce9562bcbe3b96e6790 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 8 Aug 2023 16:35:09 -0500
Subject: [PATCH] Test against Spring Framework 6.1/Spring Security 6.1 on CI.

Resolves #1369.
---
 Jenkinsfile         | 32 +++++++++++++++++++++++++++++++-
 pom.xml             | 22 ++++++++++++++++++----
 smoke-tests/pom.xml |  2 +-
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 467c11aa..b0ed95a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
 		stage("Test other configurations") {
 			when {
 				beforeAgent(true)
-				branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+				branch(pattern: "issue/spring-next-gen|main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 			}
 
 			parallel {
@@ -69,6 +69,36 @@ pipeline {
 					}
 				}
 
+				stage("Test: spring-next-gen (main)") {
+					agent any
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+								sh "PROFILE=jakarta-ee-10,spring-next-gen,convergence ci/test.sh"
+							}
+						}
+					}
+				}
+
+				stage("Test: spring-next-gen-snapshot (main)") {
+					agent any
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+								sh "PROFILE=jakarta-ee-10,spring-next-gen-snapshot,convergence ci/test.sh"
+							}
+						}
+					}
+				}
+
 				stage("Test: jakarta-ee-9 (main)") {
 					agent any
 					options { timeout(time: 30, unit: 'MINUTES')}
diff --git a/pom.xml b/pom.xml
index 27f881f3..e3018f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,9 +114,9 @@
         <saaj-impl.version>2.0.1</saaj-impl.version>
         <slf4j.version>2.0.6</slf4j.version>
         <smack.version>4.3.5</smack.version>
-        <spring.version>6.0.10</spring.version>
+        <spring.version>6.0.11</spring.version>
         <spring-hateos.version>2.0.1</spring-hateos.version>
-        <spring-security.version>6.0.3</spring-security.version>
+        <spring-security.version>6.0.5</spring-security.version>
         <sun-mail.version>2.0.1</sun-mail.version>
         <stax.version>2.0.1</stax.version>
         <woodstox.version>6.5.1</woodstox.version>
@@ -295,8 +295,22 @@
         <profile>
             <id>spring-buildsnapshot</id>
             <properties>
-                <spring.version>6.0.11-SNAPSHOT</spring.version>
-                <spring-security.version>6.0.4-SNAPSHOT</spring-security.version>
+                <spring.version>6.0.12-SNAPSHOT</spring.version>
+                <spring-security.version>6.0.6-SNAPSHOT</spring-security.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>spring-next-gen</id>
+            <properties>
+                <spring.version>6.1.0-M3</spring.version>
+                <spring-security.version>6.2.0-M1</spring-security.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>spring-next-gen-snapshot</id>
+            <properties>
+                <spring.version>6.1.0-SNAPSHOT</spring.version>
+                <spring-security.version>6.2.0-SNAPSHOT</spring-security.version>
             </properties>
         </profile>
 
diff --git a/smoke-tests/pom.xml b/smoke-tests/pom.xml
index d8da90dd..21082e31 100644
--- a/smoke-tests/pom.xml
+++ b/smoke-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.6</version>
+        <version>3.1.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>