diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 2a46c0f9..55816b79 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -6,7 +6,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.3.19' mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-RC1' mavenBom 'org.springframework.security:spring-security-bom:5.7.0-RC1' - mavenBom 'org.testcontainers:testcontainers-bom:1.17.1' + mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } dependencies { @@ -15,25 +15,25 @@ dependencyManagement { entry 'hazelcast-client' } - dependency 'org.aspectj:aspectjweaver:1.9.9.1' - dependency 'ch.qos.logback:logback-core:1.2.11' + dependency 'org.aspectj:aspectjweaver:1.9.7' + dependency 'ch.qos.logback:logback-core:1.2.10' dependency 'com.google.code.findbugs:jsr305:3.0.2' dependency 'com.h2database:h2:1.4.200' - dependency 'com.ibm.db2:jcc:11.5.7.0' + dependency 'com.ibm.db2:jcc:11.5.6.0' dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8' - dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0' + dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1' dependency 'com.zaxxer:HikariCP:3.4.5' dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' - dependency 'io.lettuce:lettuce-core:6.1.8.RELEASE' + dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' - dependency 'mysql:mysql-connector-java:8.0.28' + dependency 'mysql:mysql-connector-java:8.0.27' dependency 'org.apache.derby:derby:10.14.2.0' dependency 'org.assertj:assertj-core:3.22.0' - dependency 'org.hamcrest:hamcrest:2.2' - dependency 'org.hsqldb:hsqldb:2.6.1' - dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - dependencySet(group: 'org.mockito', version: '4.4.0') { + dependency 'org.hamcrest:hamcrest:2.1' + dependency 'org.hsqldb:hsqldb:2.5.2' + dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4' + dependencySet(group: 'org.mockito', version: '4.2.0') { entry 'mockito-core' entry 'mockito-junit-jupiter' } @@ -43,7 +43,7 @@ dependencyManagement { entry 'mongodb-driver-sync' entry 'mongodb-driver-reactivestreams' } - dependency 'org.postgresql:postgresql:42.3.4' + dependency 'org.postgresql:postgresql:42.3.1' } } diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java index b1e32db9..93f575ca 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java @@ -29,7 +29,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor */ public abstract class AbstractRedisITests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; protected static class BaseConfig { diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java index f42a939d..68f4a52a 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java @@ -42,11 +42,11 @@ final class DatabaseContainers { } static MariaDBContainer mariaDb() { - return new MariaDBContainer<>("mariadb:10.7.3"); + return new MariaDBContainer<>("mariadb:10.6.4"); } static MySQLContainer mySql() { - return new MySQLContainer<>("mysql:8.0.28"); + return new MySQLContainer<>("mysql:8.0.27"); } static OracleContainer oracle() { @@ -68,7 +68,7 @@ final class DatabaseContainers { } static PostgreSQLContainer postgreSql() { - return new PostgreSQLContainer<>("postgres:14.2"); + return new PostgreSQLContainer<>("postgres:14.0"); } static MSSQLServerContainer sqlServer() { diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 017a8247..3db9c87e 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,14 +4,14 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.11' - dependency 'com.maxmind.geoip2:geoip2:2.16.1' + dependency 'ch.qos.logback:logback-classic:1.2.10' + dependency 'com.maxmind.geoip2:geoip2:2.15.0' dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2' dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' - dependency 'org.seleniumhq.selenium:htmlunit-driver:3.60.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.36' - dependency 'org.slf4j:log4j-over-slf4j:1.7.36' + dependency 'org.seleniumhq.selenium:htmlunit-driver:3.56.0' + dependency 'org.slf4j:jcl-over-slf4j:1.7.33' + dependency 'org.slf4j:log4j-over-slf4j:1.7.33' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java b/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java index 0ebd4400..f765ccb1 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java @@ -46,7 +46,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @SpringBootTest(webEnvironment = WebEnvironment.MOCK) class FindByUsernameTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Autowired private MockMvc mockMvc; diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java index 2f7b54c4..d701e3a0 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; @AutoConfigureMockMvc class HttpRedisJsonTest { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Autowired private MockMvc mockMvc; diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java index 9bcbfacb..fbd55c46 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest class RedisSerializerTest { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @SpringSessionRedisOperations private RedisTemplate sessionRedisTemplate; diff --git a/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java b/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java index c1691981..589534ed 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java +++ b/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java @@ -41,7 +41,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @SpringBootTest(webEnvironment = WebEnvironment.MOCK) class BootTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Autowired private MockMvc mockMvc; diff --git a/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java b/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java index a595b96b..3b259096 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java +++ b/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java @@ -45,7 +45,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @SpringBootTest(webEnvironment = WebEnvironment.MOCK) class BootTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Autowired private MockMvc mockMvc; diff --git a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java index 4cebe0b7..1978df68 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java +++ b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class AttributeTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.9"; @LocalServerPort private int port; diff --git a/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java b/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java index b320a94c..bea40f54 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java +++ b/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class AttributeTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @LocalServerPort private int port; diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java b/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java index 77e6b6df..efc6f1dd 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class ApplicationTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Value("${local.server.port}") private String port; diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..2bd27bdc 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..2bd27bdc 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java b/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java index a74448a0..b3524429 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java @@ -53,7 +53,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration class RestMockMvcTests { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Autowired private SessionRepositoryFilter sessionRepositoryFilter; diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..2bd27bdc 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..2bd27bdc 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..2bd27bdc 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:5.0.14"; + private static final String DOCKER_IMAGE = "redis:5.0.10"; @Bean public GenericContainer redisContainer() {