diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 98eda925..fc8abc7f 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -25,7 +25,7 @@ dependencyManagement { dependency 'javax.annotation:javax.annotation-api:1.3.2' dependency 'javax.servlet:javax.servlet-api:4.0.1' dependency 'junit:junit:4.13.2' - dependency 'mysql:mysql-connector-java:8.0.26' + dependency 'mysql:mysql-connector-java:8.0.27' dependency 'org.apache.derby:derby:10.14.2.0' dependency 'org.assertj:assertj-core:3.19.0' dependency 'org.hsqldb:hsqldb:2.5.2' 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 93f575ca..b1e32db9 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; protected static class BaseConfig { diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 247372be..9377fadf 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,10 +1,10 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.12.5' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.12.6' } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.6' + dependency 'ch.qos.logback:logback-classic:1.2.9' 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' 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 f765ccb1..0ebd4400 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 d701e3a0..2f7b54c4 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 fbd55c46..9bcbfacb 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 589534ed..c1691981 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 3b259096..a595b96b 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 1978df68..4cebe0b7 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.9"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 bea40f54..b320a94c 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 efc6f1dd..77e6b6df 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 2bd27bdc..5077d3e7 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 2bd27bdc..5077d3e7 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 b3524429..a74448a0 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 2bd27bdc..5077d3e7 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 2bd27bdc..5077d3e7 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @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 2bd27bdc..5077d3e7 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.10"; + private static final String DOCKER_IMAGE = "redis:5.0.14"; @Bean public GenericContainer redisContainer() {