Merge branch 'main' into tc-2.0

Author: eddumelendez

configuration-metadata/spring-boot-configuration-metadata-changelog-generator/build.gradle

@@ -155,6 +155,8 @@ def dependenciesOf(String version) {
 		}
 		if (version.equals("4.0.0-RC1")) {
 			modules -= [
+				"spring-boot-session-data-mongodb",
+				"spring-boot-session-hazelcast",
 				"spring-boot-tx"
 			]
 			modules += [

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/web/spring-session.adoc

@@ -1,13 +1,11 @@
 [[web.spring-session]]
 = Spring Session
 
-Spring Boot provides {url-spring-session-site}[Spring Session] auto-configuration for a wide range of data stores.
+Spring Boot provides {url-spring-session-site}[Spring Session] auto-configuration for a range of data stores.
 When building a servlet web application, the following stores can be auto-configured:
 
 * Redis
 * JDBC
-* Hazelcast
-* MongoDB
 
 Additionally, {url-spring-boot-for-apache-geode-site}[Spring Boot for Apache Geode] provides {url-spring-boot-for-apache-geode-docs}#geode-session[auto-configuration for using Apache Geode as a session store].
 
@@ -18,24 +16,10 @@ If you have more than one implementation, Spring Boot uses the following order f
 
 . Redis
 . JDBC
-. Hazelcast
-. MongoDB
-. If none of Redis, JDBC, Hazelcast and MongoDB are available, we do not configure a javadoc:org.springframework.session.SessionRepository[].
-
-
-When building a reactive web application, the following stores can be auto-configured:
-
-* Redis
-* MongoDB
-
-The reactive auto-configuration replaces the need to use `@Enable*WebSession`.
-
-Similar to the servlet configuration, if you have more than one implementation, Spring Boot uses the following order for choosing a specific implementation:
-
-. Redis
-. MongoDB
-. If neither Redis nor MongoDB are available, we do not configure a javadoc:org.springframework.session.ReactiveSessionRepository[].
+. If neither Redis nor JDBC are available, we do not configure a javadoc:org.springframework.session.SessionRepository[].
 
+When building a reactive web application, the Redis store can be auto-configured.
+This replaces the need to use `@EnableRedisWebSession`.
 
 Each store has specific additional settings.
 For instance, it is possible to customize the name of the table for the JDBC store, as shown in the following example:
@@ -51,7 +35,6 @@ spring:
 For setting the timeout of the session you can use the configprop:spring.session.timeout[] property.
 If that property is not set with a servlet web application, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[].
 
-
-You can take control over Spring Session's configuration using `@Enable*HttpSession` (servlet) or `@Enable*WebSession` (reactive).
+You can take control over Spring Session's configuration using `@Enable*HttpSession` (servlet) or `@EnableRedisWebSession` (reactive).
 This will cause the auto-configuration to back off.
 Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties.

module/spring-boot-autoconfigure-classic-modules/build.gradle

@@ -235,15 +235,9 @@ dependencies {
 	api(project(":module:spring-boot-session")) {
 		transitive = false
 	}
-	api(project(":module:spring-boot-session-data-mongodb")) {
-		transitive = false
-	}
 	api(project(":module:spring-boot-session-data-redis")) {
 		transitive = false
 	}
-	api(project(":module:spring-boot-session-hazelcast")) {
-		transitive = false
-	}
 	api(project(":module:spring-boot-session-jdbc")) {
 		transitive = false
 	}