Update to Spring Framework 7.0.0-SNAPSHOT

Author: rwinch

buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "4.1.0"
+    id "org.gretty" version "4.1.6"
     id "io.spring.convention.spring-sample-war"
 }
 

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ jakarta-websocket = "2.1.1"
 org-apache-derby = "10.16.1.1"
 org-mockito = "5.16.1"
 org-mongodb = "5.5.1"
-org-springframework-boot = "3.5.4-SNAPSHOT"
+org-springframework-boot = "4.0.0-SNAPSHOT"
 
 [libraries]
 ch-qos-logback-logback-core = { module = "ch.qos.logback:logback-core", version = "1.5.18" }
@@ -16,10 +16,11 @@ com-ibm-db2-jcc = "com.ibm.db2:jcc:12.1.2.0"
 com-microsoft-sqlserver-mssql-jdbc = "com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11"
 com-oracle-database-jdbc-ojdbc8 = "com.oracle.database.jdbc:ojdbc8:23.7.0.25.01"
 com-squareup-okhttp3-okhttp = "com.squareup.okhttp3:okhttp:3.14.9"
+commons-logging="commons-logging:commons-logging:1.3.5"
 com-zaxxer-HikariCP = "com.zaxxer:HikariCP:6.2.1"
 edu-umd-cs-mtc-multithreadedtc = "edu.umd.cs.mtc:multithreadedtc:1.01" # FIXME: Delete multithreadedtc or update?
 io-lettuce-lettuce-core = "io.lettuce:lettuce-core:6.5.5.RELEASE"
-io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2024.0.7"
+io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2025.0.0-M4"
 jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
 jakarta-websocket-jakarta-websocket-api = { module = "jakarta.websocket:jakarta.websocket-api", version.ref = "jakarta-websocket" }
 jakarta-websocket-jakarta-websocket-client-api = { module = "jakarta.websocket:jakarta.websocket-client-api", version.ref = "jakarta-websocket" }
@@ -38,9 +39,9 @@ org-mongodb-mongodb-driver-core = { module = "org.mongodb:mongodb-driver-core",
 org-mongodb-mongodb-driver-reactivestreams = { module = "org.mongodb:mongodb-driver-reactivestreams", version.ref = "org-mongodb" }
 org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "org-mongodb" }
 org-postgresql = "org.postgresql:postgresql:42.7.7"
-org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2025.0.1"
-org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.5.1"
-org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.2.8"
+org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2025.1.0-SNAPSHOT"
+org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:7.0.0-SNAPSHOT"
+org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:7.0.0-SNAPSHOT"
 org-testcontainers-testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "1.20.6" }
 io-spring-security-release-plugin = "io.spring.gradle:spring-security-release-plugin:1.0.6"
 org-springframework-boot-spring-boot-gradle-plugin = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "org-springframework-boot" }

spring-session-core/spring-session-core.gradle

@@ -5,7 +5,7 @@ description = "Spring Session"
 dependencies {
 	management platform(project(":spring-session-dependencies"))
 
-	api "org.springframework:spring-jcl"
+	api libs.commons.logging
 
 	optional "io.projectreactor:reactor-core"
 	optional "jakarta.servlet:jakarta.servlet-api"

spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle

@@ -7,6 +7,7 @@ dependencies {
 	implementation  "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation  "org.springframework.boot:spring-boot-starter-security"
 	implementation  "org.springframework.boot:spring-boot-starter-data-redis"
+	implementation  "org.springframework.boot:spring-boot-session-data-redis"
 	implementation  "org.springframework.boot:spring-boot-devtools"
 	implementation  "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	implementation  "org.webjars:bootstrap"

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java

@@ -16,7 +16,7 @@
 
 package sample.config;
 
-import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
+import org.springframework.boot.security.autoconfigure.servlet.PathRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle

@@ -7,6 +7,7 @@ dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-actuator"
 	implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation "org.springframework.boot:spring-boot-starter-security"
+	implementation "org.springframework.boot:spring-boot-session-hazelcast"
 	implementation "com.hazelcast:hazelcast"
 	implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	implementation "org.webjars:bootstrap"

spring-session-samples/spring-session-sample-boot-hazelcast/src/integration-test/java/sample/BootTests.java

@@ -24,7 +24,7 @@
 import sample.pages.LoginPage;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.session.SessionsEndpoint;
+import org.springframework.boot.session.endpoint.SessionsEndpoint;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;

spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/Application.java

@@ -18,12 +18,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
 
 /**
  * @author Ellie Bahadori
  */
-@EnableCaching
 @SpringBootApplication
 public class Application {
 

spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/config/SecurityConfig.java

@@ -16,7 +16,7 @@
 
 package sample.config;
 
-import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
+import org.springframework.boot.security.autoconfigure.servlet.PathRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle

@@ -4,6 +4,7 @@ dependencies {
 	management platform(project(":spring-session-dependencies"))
 	implementation project(':spring-session-jdbc')
 	implementation "org.springframework.boot:spring-boot-starter-jdbc"
+	implementation "org.springframework.boot:spring-boot-session-jdbc"
 	implementation "org.springframework.boot:spring-boot-starter-web"
 	implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation "org.springframework.boot:spring-boot-starter-security"