diff --git a/spring-session-docs/modules/ROOT/pages/api.adoc b/spring-session-docs/modules/ROOT/pages/api.adoc index 7f6d7dbd7..653dbc6bd 100644 --- a/spring-session-docs/modules/ROOT/pages/api.adoc +++ b/spring-session-docs/modules/ROOT/pages/api.adoc @@ -1,7 +1,7 @@ [[api]] = API Documentation -You can browse the complete {docs-url}/spring-session/docs/{spring-session-version}/api/[Javadoc] online. The key APIs are described in the following sections: +You can browse the complete {docs-url}/spring-session/reference/{spring-session-version}/api/java[Javadoc] online. The key APIs are described in the following sections: * <> * <> @@ -261,7 +261,7 @@ You can customize the serialization by creating a bean named `springSessionDefau `RedisIndexedSessionRepository` is subscribed to receive events from Redis by using a `RedisMessageListenerContainer`. You can customize the way those events are dispatched by creating a bean named `springSessionRedisTaskExecutor`, a bean `springSessionRedisSubscriptionExecutor`, or both. -You can find more details on configuring Redis task executors {docs-url}/spring-data-redis/docs/{spring-data-redis-version}/reference/html/#redis:pubsub:subscribe:containers[here]. +You can find more details on configuring Redis task executors {docs-url}/spring-data/redis/reference/redis/pubsub.html#redis:pubsub:subscribe:containers[here]. [[api-redisindexedsessionrepository-storage]] === Storage Details @@ -588,7 +588,7 @@ include::{indexdoc-tests}[tags=new-jdbcindexedsessionrepository] ---- ==== -For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, see the {docs-url}/spring/docs/{spring-core-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation]. +For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, see the {spring-framework-ref-docs}/data-access.html[Spring Framework Reference Documentation]. [[api-jdbcindexedsessionrepository-config]] === Using `@EnableJdbcHttpSession` diff --git a/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc b/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc index 7406949ef..48b2b1fce 100644 --- a/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc +++ b/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc @@ -36,7 +36,7 @@ Maven:: ---- ====== -If you are using Spring Boot, it will take care of enabling Spring Session JDBC, see {spring-boot-ref-docs}/web.html#web.spring-session[its documentation] for more details. +If you are using Spring Boot, it will take care of enabling Spring Session JDBC, see {spring-boot-ref-docs}/web/spring-session.html[its documentation] for more details. Otherwise, you will need to add `@EnableJdbcHttpSession` to a configuration class: [tabs] diff --git a/spring-session-docs/modules/ROOT/pages/configuration/redis.adoc b/spring-session-docs/modules/ROOT/pages/configuration/redis.adoc index 458f53aa6..b84e51609 100644 --- a/spring-session-docs/modules/ROOT/pages/configuration/redis.adoc +++ b/spring-session-docs/modules/ROOT/pages/configuration/redis.adoc @@ -3,7 +3,7 @@ Now that you have your application configured, you might want to start customizing things: -- I want to {spring-boot-ref-docs}/application-properties.html#application-properties.data.spring.data.redis.host[customize the Redis configuration] using Spring Boot properties +- I want to {docs-url}/spring-boot/appendix/application-properties/index.html#application-properties.data.spring.data.redis.host[customize the Redis configuration] using Spring Boot properties - I want <> `RedisSessionRepository` or `RedisIndexedSessionRepository`. - I want to <>. - I want to <>. @@ -49,13 +49,13 @@ For that reason, Spring Session uses a `namespace` (defaults to `spring:session` === Using Spring Boot Properties -You can specify it by setting the `spring.session.redis.namespace` property. +You can specify it by setting the `spring.session.data.redis.namespace` property. ==== .application.properties [source,properties,role="primary"] ---- -spring.session.redis.namespace=spring:session:myapplication +spring.session.data.redis.namespace=spring:session:myapplication ---- .application.yml @@ -63,8 +63,9 @@ spring.session.redis.namespace=spring:session:myapplication ---- spring: session: - redis: - namespace: "spring:session:myapplication" + data: + redis: + namespace: "spring:session:myapplication" ---- ==== @@ -137,7 +138,7 @@ However, if you want to be explicit about it, you can set the following property .application.properties [source,properties,role="primary"] ---- -spring.session.redis.repository-type=default +spring.session.data.redis.repository-type=default ---- .application.yml @@ -145,8 +146,9 @@ spring.session.redis.repository-type=default ---- spring: session: - redis: - repository-type: default + data: + redis: + repository-type: default ---- ==== @@ -176,7 +178,7 @@ You can configure the `RedisIndexedSessionRepository` by setting the following p .application.properties [source,properties,role="primary"] ---- -spring.session.redis.repository-type=indexed +spring.session.data.redis.repository-type=indexed ---- .application.yml @@ -184,8 +186,9 @@ spring.session.redis.repository-type=indexed ---- spring: session: - redis: - repository-type: indexed + data: + redis: + repository-type: indexed ---- ==== @@ -212,7 +215,7 @@ In order to be able to do that, you must be using the <>. With the indexed repository configured, you can now start to listen to `SessionCreatedEvent`, `SessionDeletedEvent`, `SessionDestroyedEvent` and `SessionExpiredEvent` events. -There are a {docs-url}/spring-framework/reference/core/beans/context-introduction.html#context-functionality-events[few ways to listen to application events] in Spring, we are going to use the `@EventListener` annotation. +There are a {spring-framework-ref-docs}/core/beans/context-introduction.html#context-functionality-events[few ways to listen to application events] in Spring, we are going to use the `@EventListener` annotation. ==== [source,java] diff --git a/spring-session-docs/modules/ROOT/pages/guides/boot-jdbc.adoc b/spring-session-docs/modules/ROOT/pages/guides/boot-jdbc.adoc index f555c3704..8be482143 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/boot-jdbc.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/boot-jdbc.adoc @@ -26,8 +26,8 @@ If you use Maven, you must add the following dependencies: - org.springframework.session - spring-session-jdbc + org.springframework.boot + spring-boot-starter-session-jdbc ---- @@ -63,7 +63,7 @@ spring.session.jdbc.table-name=SPRING_SESSION # Name of the database table used ---- ==== -For more information, see the {docs-url}/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-session[Spring Session] portion of the Spring Boot documentation. +For more information, see the {docs-url}/spring-boot/reference/web/spring-session.html[Spring Session] portion of the Spring Boot documentation. [[httpsession-jdbc-boot-configuration]] == Configuring the `DataSource` @@ -81,7 +81,7 @@ spring.datasource.password= # Login password of the database. ---- ==== -For more information, see the {docs-url}/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-configure-datasource[Configure a DataSource] portion of the Spring Boot documentation. +For more information, see the {docs-url}/spring-boot/reference/data/sql.html#data.sql.datasource[Configure a DataSource] portion of the Spring Boot documentation. [[httpsession-jdbc-boot-servlet-configuration]] == Servlet Container Initialization diff --git a/spring-session-docs/modules/ROOT/pages/guides/boot-redis.adoc b/spring-session-docs/modules/ROOT/pages/guides/boot-redis.adoc index a32908cbb..7656d286a 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/boot-redis.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/boot-redis.adoc @@ -25,8 +25,8 @@ We assume you are working with a working Spring Boot web application. - org.springframework.session - spring-session-data-redis + org.springframework.boot + spring-boot-starter-session-data-redis ---- @@ -34,7 +34,7 @@ We assume you are working with a working Spring Boot web application. .build.gradle [source,groovy,role="secondary"] ---- -implementation("org.springframework.session:spring-session-data-redis") +implementation("org.springframework.boot:spring-boot-starter-session-data-redis") ---- ==== @@ -56,12 +56,12 @@ Further customization is possible by using `application.properties`, as the foll .src/main/resources/application.properties ---- server.servlet.session.timeout= # Session timeout. If a duration suffix is not specified, seconds is used. -spring.session.redis.flush-mode=on_save # Sessions flush mode. -spring.session.redis.namespace=spring:session # Namespace for keys used to store sessions. +spring.session.data.redis.flush-mode=on_save # Sessions flush mode. +spring.session.data.redis.namespace=spring:session # Namespace for keys used to store sessions. ---- ==== -For more information, see the {docs-url}/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-session[Spring Session] portion of the Spring Boot documentation. +For more information, see the {docs-url}/spring-boot/reference/web/spring-session.html[Spring Session] portion of the Spring Boot documentation. [[boot-redis-configuration]] == Configuring the Redis Connection @@ -79,7 +79,7 @@ spring.data.redis.port=6379 # Redis server port. ---- ==== -For more information, see the {docs-url}/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation. +For more information, see the {docs-url}/spring-boot/reference/data/nosql.html#data.nosql.redis[Redis] portion of the Spring Boot documentation. [[boot-servlet-configuration]] == Servlet Container Initialization diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc index 64b4bdf6b..2ce1bd11d 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/java-jdbc.adoc @@ -100,7 +100,7 @@ We configure the H2 database to create database tables by using the SQL script t <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`. ==== -For additional information on how to configure data access related concerns, see the {docs-url}/spring/docs/{spring-core-version}/reference/html/data-access.html[Spring Framework Reference Documentation]. +For additional information on how to configure data access related concerns, see the {spring-framework-ref-docs}/data-access.html[Spring Framework Reference Documentation]. == Java Servlet Container Initialization diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc index cb432a9a0..89d4dca84 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/java-redis.adoc @@ -101,7 +101,7 @@ The filter is in charge of replacing the `HttpSession` implementation to be back In this instance, Spring Session is backed by Redis. <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server. We configure the connection to connect to localhost on the default port (6379). -For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation]. +For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/redis/reference/[reference documentation]. ==== == Java Servlet Container Initialization diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc index 92c6e744d..3ad8aafd4 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc @@ -101,7 +101,7 @@ The filter is in charge of replacing the `HttpSession` implementation to be back In this instance, Spring Session is backed by Redis. <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server. We configure the connection to connect to localhost on the default port (6379). -For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation]. +For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/redis/reference/[reference documentation]. <3> We customize Spring Session's HttpSession integration to use HTTP headers to convey the current session information instead of cookies. ==== diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc index fe2e5b73a..622683e22 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/java-security.adoc @@ -99,7 +99,7 @@ The filter is in charge of replacing the `HttpSession` implementation to be back In this instance Spring Session is backed by Redis. <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server. We configure the connection to connect to localhost on the default port (6379) -For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation]. +For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/redis/reference/[reference documentation]. ==== == Servlet Container Initialization diff --git a/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc b/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc index 2b049713b..d97313df0 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/xml-jdbc.adoc @@ -102,7 +102,7 @@ We configure the H2 database to create database tables by using the SQL script t <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`. ==== -For additional information on how to configure data access-related concerns, see the {docs-url}/spring/docs/{spring-core-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation]. +For additional information on how to configure data access-related concerns, see the {spring-framework-ref-docs}/data-access.html[Spring Framework Reference Documentation]. == XML Servlet Container Initialization @@ -121,7 +121,7 @@ include::{samples-dir}spring-session-sample-xml-jdbc/src/main/webapp/WEB-INF/web ---- ==== -The {docs-url}/spring/docs/{spring-core-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the `contextConfigLocation` and picks up our session.xml configuration. +The {spring-framework-ref-docs}/core/beans/context-introduction.html#context-create[`ContextLoaderListener`] reads the `contextConfigLocation` and picks up our session.xml configuration. Last, we need to ensure that our Servlet Container (that is, Tomcat) uses our `springSessionRepositoryFilter` for every request. The following snippet performs this last step for us: diff --git a/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc b/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc index c3673f845..d4756b570 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc +++ b/spring-session-docs/modules/ROOT/pages/guides/xml-redis.adoc @@ -122,7 +122,7 @@ include::{samples-dir}spring-session-sample-xml-redis/src/main/webapp/WEB-INF/we ---- ==== -The {docs-url}/spring/docs/{spring-core-version}/spring-framework-reference/core.html#context-create[`ContextLoaderListener`] reads the contextConfigLocation and picks up our session.xml configuration. +The {spring-framework-ref-docs}/core/beans/context-introduction.html#context-create[`ContextLoaderListener`] reads the contextConfigLocation and picks up our session.xml configuration. Last, we need to ensure that our Servlet Container (that is, Tomcat) uses our `springSessionRepositoryFilter` for every request. The following snippet performs this last step for us: diff --git a/spring-session-docs/modules/ROOT/pages/spring-security.adoc b/spring-session-docs/modules/ROOT/pages/spring-security.adoc index 1b9b53a9f..d29185639 100644 --- a/spring-session-docs/modules/ROOT/pages/spring-security.adoc +++ b/spring-session-docs/modules/ROOT/pages/spring-security.adoc @@ -6,7 +6,7 @@ Spring Session provides integration with Spring Security. [[spring-security-rememberme]] == Spring Security Remember-me Support -Spring Session provides integration with {docs-url}/spring-security/site/docs/{spring-security-core-version}/reference/html5/#servlet-rememberme[Spring Security's Remember-me Authentication]. +Spring Session provides integration with {spring-security-ref-docs}/servlet/authentication/rememberme.html[Spring Security's Remember-me Authentication]. The support: * Changes the session expiration length diff --git a/spring-session-docs/modules/ROOT/pages/web-session.adoc b/spring-session-docs/modules/ROOT/pages/web-session.adoc index 37665cd70..dc24deb9d 100644 --- a/spring-session-docs/modules/ROOT/pages/web-session.adoc +++ b/spring-session-docs/modules/ROOT/pages/web-session.adoc @@ -37,7 +37,7 @@ This is what is in charge of replacing the `WebSession` implementation to be bac In this instance, Spring Session is backed by Redis. <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server. We configure the connection to connect to localhost on the default port (6379) -For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation]. +For more information on configuring Spring Data Redis, see the {docs-url}/spring-data/redis/reference/[reference documentation]. ==== [[websession-how]] @@ -113,4 +113,4 @@ public class SpringSessionWebSessionStore implements WebSessi ==== To be detected by Spring WebFlux, this custom `WebSessionStore` needs to be registered with `ApplicationContext` as a bean named `webSessionManager`. -For additional information on Spring WebFlux, see the {docs-url}/spring-framework/docs/{spring-core-version}/reference/html/web-reactive.html[Spring Framework Reference Documentation]. +For additional information on Spring WebFlux, see the {spring-framework-ref-docs}/web/webflux.html[Spring Framework Reference Documentation]. diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index ddb751f00..b01ae10f0 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -55,16 +55,12 @@ tasks.register("generateAntoraResources") { def generateAttributes() { - def springBootVersion = getLibVersion(libs.versions.org.springframework.boot.get()) - def springSecurityVersion = getLibVersion(libs.org.springframework.security.spring.security.bom.get().version) - def springFrameworkVersion = getLibVersion(libs.org.springframework.spring.framework.bom.get().version) def ghTag = snapshotBuild ? 'main' : project.version def docsUrl = 'https://docs.spring.io' - def springBootRefDocs = "${docsUrl}/spring-boot/docs/${springBootVersion}/reference/html" - def springSecurityRefDocs = "${docsUrl}/spring-security/reference/${springSecurityVersion}" - def springFrameworkRefDocs = "${docsUrl}/spring-framework/reference/${springFrameworkVersion}" + def springBootRefDocs = "${docsUrl}/spring-boot/reference" + def springSecurityRefDocs = "${docsUrl}/spring-security/reference" + def springFrameworkRefDocs = "${docsUrl}/spring-framework/reference" return ['gh-tag':ghTag, - 'spring-boot-version': springBootVersion, 'spring-boot-ref-docs': springBootRefDocs.toString(), 'spring-session-version': project.version, 'spring-security-ref-docs': springSecurityRefDocs.toString(), @@ -72,12 +68,6 @@ def generateAttributes() { 'docs-url': docsUrl] } -static def getLibVersion(String version) { - return version.contains("-") - ? version.substring(0, version.indexOf("-")) - : version -} - sourceSets { test { java { diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle index 23a294b9b..01f4dc22e 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle @@ -7,8 +7,7 @@ dependencies { implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.apache.httpcomponents:httpclient" implementation "org.springframework.boot:spring-boot-devtools" - implementation "org.springframework.boot:spring-boot-session-data-redis" - implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-starter-session-data-redis" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle index 14fe23092..34f99cfb8 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle +++ b/spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle @@ -4,9 +4,8 @@ dependencies { management platform(project(":spring-session-dependencies")) implementation project(':spring-session-jdbc') implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" - implementation "org.springframework.boot:spring-boot-session-jdbc" implementation libs.jackson.databind - implementation "org.springframework.boot:spring-boot-starter-jdbc" + implementation "org.springframework.boot:spring-boot-starter-session-jdbc" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle index db45cced6..d1be681e1 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle @@ -7,7 +7,7 @@ dependencies { implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.springframework.boot:spring-boot-devtools" implementation "org.springframework.boot:spring-boot-h2console" - implementation "org.springframework.boot:spring-boot-session-jdbc" + implementation "org.springframework.boot:spring-boot-starter-session-jdbc" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/application.properties b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/application.properties index 106d44fb6..64ca86e8d 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/application.properties +++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/application.properties @@ -1,2 +1,3 @@ spring.security.user.password=password spring.h2.console.enabled=true +spring.datasource.generate-unique-name=false diff --git a/spring-session-samples/spring-session-sample-boot-reactive-max-sessions/spring-session-sample-boot-reactive-max-sessions.gradle b/spring-session-samples/spring-session-sample-boot-reactive-max-sessions/spring-session-sample-boot-reactive-max-sessions.gradle index daf3b849f..9f9ae7756 100644 --- a/spring-session-samples/spring-session-sample-boot-reactive-max-sessions/spring-session-sample-boot-reactive-max-sessions.gradle +++ b/spring-session-samples/spring-session-sample-boot-reactive-max-sessions/spring-session-sample-boot-reactive-max-sessions.gradle @@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { management platform(project(":spring-session-dependencies")) - implementation 'org.springframework.boot:spring-boot-session-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-session-data-redis' implementation 'org.springframework.boot:spring-boot-starter-data-redis-reactive' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle index a0a663c15..8db7a6503 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle @@ -5,8 +5,7 @@ dependencies { implementation project(':spring-session-data-redis') implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.springframework.boot:spring-boot-devtools" - implementation "org.springframework.boot:spring-boot-session-data-redis" - implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-starter-session-data-redis" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle index 424dfbc61..c812e0bef 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle @@ -5,8 +5,7 @@ dependencies { implementation project(':spring-session-data-redis') implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.springframework.boot:spring-boot-devtools" - implementation "org.springframework.boot:spring-boot-session-data-redis" - implementation "org.springframework.boot:spring-boot-starter-data-redis" + implementation "org.springframework.boot:spring-boot-starter-session-data-redis" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-web" diff --git a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle index fbae4d550..ceba11d8c 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle +++ b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle @@ -5,9 +5,8 @@ dependencies { implementation project(':spring-session-data-redis') implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.springframework.boot:spring-boot-devtools" - implementation "org.springframework.boot:spring-boot-session-data-redis" + implementation "org.springframework.boot:spring-boot-starter-session-data-redis" implementation "org.springframework.boot:spring-boot-starter-data-jpa" - implementation "org.springframework.boot:spring-boot-starter-data-redis" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation "org.springframework.boot:spring-boot-starter-validation"