From 69c1e3f6b2b801cb8383af1cdf4eced4e55e460e Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 18 Jan 2021 17:12:45 +0100 Subject: [PATCH] Revert "Upgrade test dependencies" This reverts commit 9c776912321bbaf0f10868e6b90ad5077d0ad304. --- gradle/dependency-management.gradle | 2 +- .../springframework/session/data/redis/AbstractRedisITests.java | 2 +- .../src/integration-test/java/sample/FindByUsernameTests.java | 2 +- .../src/integration-test/java/sample/HttpRedisJsonTest.java | 2 +- .../src/integration-test/java/sample/RedisSerializerTest.java | 2 +- .../src/integration-test/java/sample/BootTests.java | 2 +- .../src/integration-test/java/sample/BootTests.java | 2 +- .../src/integration-test/java/sample/AttributeTests.java | 2 +- .../src/integration-test/java/sample/AttributeTests.java | 2 +- .../src/integration-test/java/sample/ApplicationTests.java | 2 +- .../src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../src/integration-test/java/rest/RestMockMvcTests.java | 2 +- .../src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../src/main/java/sample/EmbeddedRedisConfig.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 926661f1..55cb6525 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,7 +1,7 @@ dependencyManagement { imports { mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR16' - mavenBom 'org.junit:junit-bom:5.6.3' + mavenBom 'org.junit:junit-bom:5.6.2' mavenBom 'org.springframework:spring-framework-bom:5.2.12.RELEASE' mavenBom 'org.springframework.data:spring-data-releasetrain:Neumann-SR6' mavenBom 'org.springframework.security:spring-security-bom:5.3.6.RELEASE' 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..8da5572b 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.6"; protected static class BaseConfig { 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..9b004ecd 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.6"; @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..1588eb77 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.6"; @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..3e41cd98 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.6"; @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..1d3f6529 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.6"; @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..3d3999c3 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.6"; @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 c3967d37..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.10"; + 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 bea40f54..dfd7be03 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.6"; @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..09b60a17 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.6"; @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..0e4de7a1 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.6"; @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..0e4de7a1 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.6"; @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..3ae74dcc 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.6"; @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..0e4de7a1 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.6"; @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..0e4de7a1 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.6"; @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..0e4de7a1 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.6"; @Bean public GenericContainer redisContainer() {