Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Spring Boot 3.5.0

Browse Source 
- Update to Spring Boot 3.5.0
- Update to Spring Boot 3.5.0's dependencies

Closes gh-3368
This commit is contained in:
Rob Winch
2025-04-03 20:49:41 -05:00
parent 0962591e43
commit b31196de82
22 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
gradle/libs.versions.toml
View File

@@ -1,69 +1,48 @@
[versions]
ch-qos-logback = "1.5.18"
jakarta-websocket = "2.1.1"
org-apache-derby = "10.16.1.1"
org-codehaus-groovy = "3.0.19"
org-gretty = "4.1.1"
org-mockito = "5.11.0"
org-mongodb = "5.2.1"
org-seleniumhq-selenium = "4.13.0"
org-slf4j = "2.0.17"
org-testcontainers = "1.19.8"
org-springframework-boot = "3.3.10"
org-mockito = "5.16.1"
org-mongodb = "5.3.1"
org-springframework-boot = "3.5.0-M3"
[libraries]
ch-qos-logback-logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "ch-qos-logback" }
ch-qos-logback-logback-core = { module = "ch.qos.logback:logback-core", version.ref = "ch-qos-logback" }
ch-qos-logback-logback-core = { module = "ch.qos.logback:logback-core", version = "1.5.18" }
com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
com-fasterxml-jackson-jackson-bom = "com.fasterxml.jackson:jackson-bom:2.17.3"
com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.17.3"
com-google-code-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
com-h2database-h2 = "com.h2database:h2:2.2.224"
com-hazelcast = "com.hazelcast:hazelcast:5.4.0"
com-ibm-db2-jcc = "com.ibm.db2:jcc:11.5.9.0"
com-maxmind-geoip2 = "com.maxmind.geoip2:geoip2:2.17.0"
com-microsoft-sqlserver-mssql-jdbc = "com.microsoft.sqlserver:mssql-jdbc:11.2.3.jre17"
com-oracle-database-jdbc-ojdbc8 = "com.oracle.database.jdbc:ojdbc8:21.13.0.0"
com-zaxxer-HikariCP = "com.zaxxer:HikariCP:5.1.0"
edu-umd-cs-mtc-multithreadedtc = "edu.umd.cs.mtc:multithreadedtc:1.01"
io-lettuce-lettuce-core = "io.lettuce:lettuce-core:6.3.2.RELEASE"
io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2023.0.16"
io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.43"
io-spring-nohttp-nohttp-checkstyle = "io.spring.nohttp:nohttp-checkstyle:0.0.11"
com-google-code-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" # FIXME: Remove findbugs?
com-h2database-h2 = "com.h2database:h2:2.3.232"
com-hazelcast = "com.hazelcast:hazelcast:5.5.0"
com-ibm-db2-jcc = "com.ibm.db2:jcc:12.1.0.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"
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.4"
jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
jakarta-servlet-jsp-jstl-jakarta-servlet-jsp-jstl-api = "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2"
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" }
mysql-mysql-connector-java = "mysql:mysql-connector-java:8.0.33"
nz-net-ultraq-thymeleaf-thymeleaf-layout-dialect = "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0"
com-squareup-okhttp3-okhttp = "com.squareup.okhttp3:okhttp:3.14.9"
mysql-mysql-connector-java = "com.mysql:mysql-connector-j:9.1.0"
org-apache-derby-derby = { module = "org.apache.derby:derby", version.ref = "org-apache-derby" }
org-apache-derby-derbytools = { module = "org.apache.derby:derbytools", version.ref = "org-apache-derby" }
org-apache-httpcomponents-httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
org-apache-logging-log4j-log4j-core = "org.apache.logging.log4j:log4j-core:2.23.1"
org-aspectj-aspectjweaver = "org.aspectj:aspectjweaver:1.9.23"
org-assertj-assertj-core = "org.assertj:assertj-core:3.25.3"
org-hamcrest = "org.hamcrest:hamcrest:2.2"
org-hsqldb = "org.hsqldb:hsqldb:2.7.4"
org-junit-junit-bom = "org.junit:junit-bom:5.10.5"
org-mariadb-jdbc-mariadb-java-client = "org.mariadb.jdbc:mariadb-java-client:3.3.4"
org-assertj-assertj-core = "org.assertj:assertj-core:3.27.3"
org-awaitility-awaitility = "org.awaitility:awaitility:4.3.0"
org-hamcrest = "org.hamcrest:hamcrest:3.0"
org-hsqldb = "org.hsqldb:hsqldb:2.7.3" # hsqldb 2.7.4 breaks Spring Data https://sourceforge.net/p/hsqldb/bugs/1725/
org-junit-junit-bom = "org.junit:junit-bom:5.12.1"
org-mariadb-jdbc-mariadb-java-client = "org.mariadb.jdbc:mariadb-java-client:3.5.2"
org-mockito-mockito-bom = { module = "org.mockito:mockito-bom", version.ref = "org-mockito" }
org-mongodb-mongodb-driver-core = { module = "org.mongodb:mongodb-driver-core", version.ref = "org-mongodb" }
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.5"
org-seleniumhq-selenium-htmlunit-driver = { module = "org.seleniumhq.selenium:htmlunit-driver", version.ref = "org-seleniumhq-selenium" }
org-seleniumhq-selenium-selenium-support = { module = "org.seleniumhq.selenium:selenium-support", version.ref = "org-seleniumhq-selenium" }
org-skyscreamer-jsonassert = "org.skyscreamer:jsonassert:1.5.3"
org-slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "org-slf4j" }
org-slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "org-slf4j" }
org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2024.1.4"
org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.4.4"
org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2025.0.0-M2"
org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.5.0-M3"
org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.2.5"
org-springframework-boot-spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "org-springframework-boot" }
org-springframework-boot-spring-boot-gradle-plugin = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "org-springframework-boot" }
org-testcontainers-testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version.ref = "org-testcontainers" }
org-awaitility-awaitility = "org.awaitility:awaitility:4.2.2"
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.3"
[plugins]
org-springframework-boot-spring-boot-gradle-plugin = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "org-springframework-boot" }
io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.43"
io-spring-nohttp-nohttp-checkstyle = "io.spring.nohttp:nohttp-checkstyle:0.0.11"

2
spring-session-jdbc/spring-session-jdbc.gradle
View File

@@ -26,7 +26,7 @@ dependencies {
integrationTestCompile "com.microsoft.sqlserver:mssql-jdbc"
integrationTestCompile "com.oracle.database.jdbc:ojdbc8"
integrationTestCompile "com.zaxxer:HikariCP"
integrationTestCompile "mysql:mysql-connector-java"
integrationTestCompile "com.mysql:mysql-connector-j"
integrationTestCompile "org.apache.derby:derby"
integrationTestCompile "org.apache.derby:derbytools"
integrationTestCompile "org.hsqldb:hsqldb"

6
spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle
View File

@@ -18,9 +18,9 @@ dependencies {
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
integrationTestCompile "org.testcontainers:testcontainers"
}

5
spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle
View File

@@ -18,6 +18,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

5
spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle
View File

@@ -16,9 +16,10 @@ dependencies {
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

4
spring-session-samples/spring-session-sample-boot-jdbc/src/integration-test/java/sample/BootTests.java
View File

@@ -53,7 +53,9 @@ class BootTests {
@AfterEach
void tearDown() {
this.driver.quit();
if (this.driver != null) {
this.driver.quit();
}
}
@Test

4
spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle
View File

@@ -10,8 +10,8 @@ dependencies {
implementation "org.testcontainers:mongodb"
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.seleniumhq.selenium:htmlunit-driver"
testImplementation "org.seleniumhq.selenium:selenium-support"
testImplementation "org.htmlunit:htmlunit"
testImplementation "org.seleniumhq.selenium:htmlunit3-driver"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

5
spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle
View File

@@ -12,10 +12,9 @@ dependencies {
implementation "org.springframework.boot:spring-boot-testcontainers"
implementation "org.testcontainers:mongodb"
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.seleniumhq.selenium:htmlunit-driver"
testImplementation "org.seleniumhq.selenium:selenium-support"
testImplementation "org.htmlunit:htmlunit"
testImplementation "org.seleniumhq.selenium:htmlunit3-driver"
testImplementation "org.springframework.security:spring-security-test"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"

4
spring-session-samples/spring-session-sample-boot-reactive-max-sessions/spring-session-sample-boot-reactive-max-sessions.gradle
View File

@@ -14,8 +14,8 @@ dependencies {
testImplementation 'org.springframework.security:spring-security-test'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.seleniumhq.selenium:selenium-java'
testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
testImplementation "org.htmlunit:htmlunit"
testImplementation "org.seleniumhq.selenium:htmlunit3-driver"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

4
spring-session-samples/spring-session-sample-boot-reactive-redis-indexed/spring-session-sample-boot-reactive-redis-indexed.gradle
View File

@@ -12,8 +12,8 @@ dependencies {
testImplementation 'org.springframework.security:spring-security-test'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.seleniumhq.selenium:selenium-java'
testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
testImplementation "org.htmlunit:htmlunit"
testImplementation "org.seleniumhq.selenium:htmlunit3-driver"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

4
spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle
View File

@@ -21,7 +21,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
integrationTestCompile "org.testcontainers:testcontainers"
}

5
spring-session-samples/spring-session-sample-boot-redis/spring-session-sample-boot-redis.gradle
View File

@@ -19,7 +19,8 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
integrationTestCompile "org.testcontainers:testcontainers"
}

4
spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/spring-session-sample-boot-webflux-custom-cookie.gradle
View File

@@ -15,7 +15,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
integrationTestCompile "org.testcontainers:testcontainers"
}

4
spring-session-samples/spring-session-sample-boot-webflux/spring-session-sample-boot-webflux.gradle
View File

@@ -15,7 +15,7 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
integrationTestCompile "org.testcontainers:testcontainers"
}

4
spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
View File

@@ -24,8 +24,8 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}
gretty {

4
spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
View File

@@ -25,6 +25,6 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

4
spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
View File

@@ -23,6 +23,6 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

4
spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
View File

@@ -24,8 +24,8 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}
gretty {

4
spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
View File

@@ -27,8 +27,8 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}
gretty {

4
spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
View File

@@ -22,6 +22,6 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

4
spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
View File

@@ -23,6 +23,6 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}

4
spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
View File

@@ -24,8 +24,8 @@ dependencies {
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
integrationTestCompile "org.seleniumhq.selenium:selenium-support"
integrationTestCompile "org.htmlunit:htmlunit"
integrationTestCompile "org.seleniumhq.selenium:htmlunit3-driver"
}
gretty {