From 52f59a83e4535fb7805aed7df87288859f8054df Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 31 May 2019 23:17:34 +0200 Subject: [PATCH] Update integration tests --- .../java/sample/FindByUsernameTests.java | 2 +- .../java/sample/HttpRedisJsonTest.java | 2 +- .../java/sample/RedisSerializerTest.java | 2 +- .../integration-test/java/sample/BootTests.java | 2 +- .../java/sample/AttributeTests.java | 2 +- .../java/sample/ApplicationTests.java | 2 +- .../main/java/sample/EmbeddedRedisConfig.java | 2 +- .../main/java/sample/EmbeddedRedisConfig.java | 2 +- .../java/rest/RestMockMvcTests.java | 2 +- .../main/java/sample/EmbeddedRedisConfig.java | 2 +- .../main/java/sample/EmbeddedRedisConfig.java | 2 +- .../main/java/sample/EmbeddedRedisConfig.java | 2 +- .../session/data/redis/AbstractRedisITests.java | 2 +- .../session/jdbc/DatabaseContainers.java | 16 ++++++++-------- .../resources/container-license-acceptance.txt | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java index dab127e5..f8570608 100644 --- a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java +++ b/samples/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) public class FindByUsernameTests { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java index 575a2ce2..b10af5d4 100644 --- a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java +++ b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; @AutoConfigureMockMvc public class HttpRedisJsonTest { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java index c356f684..3be52dcc 100644 --- a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java +++ b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest public class RedisSerializerTest { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @SpringSessionRedisOperations private RedisTemplate sessionRedisTemplate; diff --git a/samples/boot/redis/src/integration-test/java/sample/BootTests.java b/samples/boot/redis/src/integration-test/java/sample/BootTests.java index 27de0b9d..df2ac5e1 100644 --- a/samples/boot/redis/src/integration-test/java/sample/BootTests.java +++ b/samples/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) public class BootTests { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java b/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java index 5bbae8a7..e9480ec1 100644 --- a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java +++ b/samples/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) public class AttributeTests { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @LocalServerPort private int port; diff --git a/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java index 072b67dd..ddd338c3 100644 --- a/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java +++ b/samples/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) public class ApplicationTests { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Value("${local.server.port}") private String port; diff --git a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java index 6772b7fc..653eceac 100644 --- a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java index 6772b7fc..653eceac 100644 --- a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java index 405493f8..e0b6a232 100644 --- a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java +++ b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java @@ -54,7 +54,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration public class RestMockMvcTests { - private static final String DOCKER_IMAGE = "redis:5.0.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Autowired private SessionRepositoryFilter sessionRepositoryFilter; diff --git a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java index 6772b7fc..653eceac 100644 --- a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java index 6772b7fc..653eceac 100644 --- a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Bean public GenericContainer redisContainer() { diff --git a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java index 6772b7fc..653eceac 100644 --- a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; @Bean public GenericContainer redisContainer() { 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 39a15d63..76afac28 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.4"; + private static final String DOCKER_IMAGE = "redis:5.0.5"; 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 4ffd5762..8a57c3e9 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 @@ -72,7 +72,7 @@ final class DatabaseContainers { private static class MariaDb5Container extends MariaDBContainer { MariaDb5Container() { - super("mariadb:5.5.63"); + super("mariadb:5.5.64"); } @Override @@ -88,7 +88,7 @@ final class DatabaseContainers { private static class MariaDb10Container extends MariaDBContainer { MariaDb10Container() { - super("mariadb:10.3.14"); + super("mariadb:10.3.15"); } @Override @@ -103,7 +103,7 @@ final class DatabaseContainers { private static class MySql5Container extends MySQLContainer { MySql5Container() { - super("mysql:5.7.25"); + super("mysql:5.7.26"); } @Override @@ -123,7 +123,7 @@ final class DatabaseContainers { private static class MySql8Container extends MySQLContainer { MySql8Container() { - super("mysql:8.0.15"); + super("mysql:8.0.16"); } @Override @@ -143,7 +143,7 @@ final class DatabaseContainers { extends PostgreSQLContainer { PostgreSql9Container() { - super("postgres:9.6.12"); + super("postgres:9.6.13"); } } @@ -152,7 +152,7 @@ final class DatabaseContainers { extends PostgreSQLContainer { PostgreSql10Container() { - super("postgres:10.7"); + super("postgres:10.8"); } } @@ -161,7 +161,7 @@ final class DatabaseContainers { extends PostgreSQLContainer { PostgreSql11Container() { - super("postgres:11.2"); + super("postgres:11.3"); } } @@ -170,7 +170,7 @@ final class DatabaseContainers { extends MSSQLServerContainer { SqlServer2017Container() { - super("mcr.microsoft.com/mssql/server:2017-CU13"); + super("mcr.microsoft.com/mssql/server:2017-CU14"); } } diff --git a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt index f8f8d280..5a5a44f6 100644 --- a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt +++ b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt @@ -1 +1 @@ -mcr.microsoft.com/mssql/server:2017-CU13 +mcr.microsoft.com/mssql/server:2017-CU14