Skip to content

Commit 337a376

Browse files
wilkinsonaphilwebb
authored andcommitted
Create spring-boot-session modules
1 parent b8c909b commit 337a376

File tree

69 files changed

+917
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+917
-708
lines changed

Diff for: settings.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ include "spring-boot-project:spring-boot-security-oauth2-client"
107107
include "spring-boot-project:spring-boot-security-oauth2-resource-server"
108108
include "spring-boot-project:spring-boot-security-saml2"
109109
include "spring-boot-project:spring-boot-sendgrid"
110+
include "spring-boot-project:spring-boot-session"
111+
include "spring-boot-project:spring-boot-session-data-mongodb"
112+
include "spring-boot-project:spring-boot-session-data-redis"
113+
include "spring-boot-project:spring-boot-session-hazelcast"
114+
include "spring-boot-project:spring-boot-session-jdbc"
110115
include "spring-boot-project:spring-boot-test"
111116
include "spring-boot-project:spring-boot-test-autoconfigure"
112117
include "spring-boot-project:spring-boot-test-integration-tests"

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ dependencies {
6060
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
6161
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
6262
optional(project(":spring-boot-project:spring-boot-security-saml2"))
63+
optional(project(":spring-boot-project:spring-boot-session"))
6364
optional(project(":spring-boot-project:spring-boot-tomcat"))
6465
optional(project(":spring-boot-project:spring-boot-undertow"))
6566
optional(project(":spring-boot-project:spring-boot-validation"))

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
30-
import org.springframework.boot.autoconfigure.session.SessionAutoConfiguration;
3130
import org.springframework.context.annotation.Bean;
3231
import org.springframework.context.annotation.Configuration;
3332
import org.springframework.session.FindByIndexNameSessionRepository;
@@ -42,7 +41,7 @@
4241
* @author Vedran Pavic
4342
* @since 2.0.0
4443
*/
45-
@AutoConfiguration(after = SessionAutoConfiguration.class)
44+
@AutoConfiguration(afterName = "org.springframework.boot.session.autoconfigure.SessionAutoConfiguration")
4645
@ConditionalOnClass(Session.class)
4746
@ConditionalOnAvailableEndpoint(SessionsEndpoint.class)
4847
public class SessionsEndpointAutoConfiguration {

Diff for: spring-boot-project/spring-boot-autoconfigure-all/build.gradle

+1-20
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
id "org.springframework.boot.auto-configuration"
44
id "org.springframework.boot.configuration-properties"
55
id "org.springframework.boot.deployed"
6-
id "org.springframework.boot.docker-test"
76
id "org.springframework.boot.optional-dependencies"
87
}
98

@@ -23,20 +22,6 @@ dependencies {
2322
api(project(":spring-boot-project:spring-boot-all"))
2423
api(project(":spring-boot-project:spring-boot-autoconfigure"))
2524

26-
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
27-
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
28-
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
29-
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
30-
dockerTestImplementation("com.redis:testcontainers-redis")
31-
dockerTestImplementation("org.assertj:assertj-core")
32-
dockerTestImplementation("org.awaitility:awaitility")
33-
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
34-
dockerTestImplementation("org.mockito:mockito-core")
35-
dockerTestImplementation("org.springframework:spring-test")
36-
dockerTestImplementation("org.testcontainers:junit-jupiter")
37-
dockerTestImplementation("org.testcontainers:mongodb")
38-
dockerTestImplementation("org.testcontainers:testcontainers")
39-
4025
optional(project(":spring-boot-project:spring-boot-activemq"))
4126
optional(project(":spring-boot-project:spring-boot-artemis"))
4227
optional(project(":spring-boot-project:spring-boot-data-jpa"))
@@ -58,6 +43,7 @@ dependencies {
5843
optional(project(":spring-boot-project:spring-boot-rsocket"))
5944
optional(project(":spring-boot-project:spring-boot-security"))
6045
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
46+
optional(project(":spring-boot-project:spring-boot-session"))
6147
optional(project(":spring-boot-project:spring-boot-tomcat"))
6248
optional(project(":spring-boot-project:spring-boot-tx"))
6349
optional(project(":spring-boot-project:spring-boot-validation"))
@@ -165,11 +151,6 @@ dependencies {
165151
exclude group: "org.opensaml", module: "opensaml-saml-impl"
166152
}
167153
optional("org.springframework.security:spring-security-web")
168-
optional("org.springframework.session:spring-session-core")
169-
optional("org.springframework.session:spring-session-data-mongodb")
170-
optional("org.springframework.session:spring-session-data-redis")
171-
optional("org.springframework.session:spring-session-hazelcast")
172-
optional("org.springframework.session:spring-session-jdbc")
173154
optional("org.springframework.amqp:spring-rabbit")
174155
optional("org.springframework.amqp:spring-rabbit-stream")
175156

Diff for: spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java

-61
This file was deleted.

Diff for: spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java

-64
This file was deleted.

Diff for: spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java

-105
This file was deleted.

0 commit comments

Comments
 (0)