From af44e71af00d68c30bead56ed07d55e8218e20e1 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Thu, 6 Sep 2018 18:05:32 +0200 Subject: [PATCH] Update integration tests --- .../src/integration-test/java/sample/FindByUsernameTests.java | 2 +- .../src/integration-test/java/sample/HttpRedisJsonTest.java | 2 +- .../src/integration-test/java/sample/RedisSerializerTest.java | 2 +- .../boot/redis/src/integration-test/java/sample/BootTests.java | 2 +- .../src/integration-test/java/sample/AttributeTests.java | 2 +- .../boot/websocket/src/test/java/sample/ApplicationTests.java | 2 +- .../custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../redis/src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../rest/src/integration-test/java/rest/RestMockMvcTests.java | 2 +- .../rest/src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../security/src/main/java/sample/EmbeddedRedisConfig.java | 2 +- samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java | 2 +- .../springframework/session/data/redis/AbstractRedisITests.java | 2 +- .../jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/MySql5JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/MySql8JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java | 2 +- .../integration-test/resources/container-license-acceptance.txt | 2 +- 21 files changed, 21 insertions(+), 21 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 8cb00a8c..e8d4cfd5 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 df607165..c39da233 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 5c42166d..804a773c 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 7127d22f..91fd130c 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 aa64e5b6..a9e8bf21 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @LocalServerPort private int port; diff --git a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java index 0b1325c3..5d41842e 100644 --- a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java +++ b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTests { - private static final String DOCKER_IMAGE = "redis:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 72d54c99..35596339 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 72d54c99..35596339 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 534e23ca..8e1d0b34 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 72d54c99..35596339 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 72d54c99..35596339 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 72d54c99..35596339 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; @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 0f6cd99d..3dfff4c2 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:4.0.10"; + private static final String DOCKER_IMAGE = "redis:4.0.11"; protected static class BaseConfig { diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java index 0a1e55c8..690bfcdf 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class MariaDb10JdbcOperationsSessionRepositoryITests private static class MariaDb10Container extends MariaDBContainer { MariaDb10Container() { - super("mariadb:10.3.8"); + super("mariadb:10.3.9"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java index b7de0055..57b0da74 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb5JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class MariaDb5JdbcOperationsSessionRepositoryITests private static class MariaDb5Container extends MariaDBContainer { MariaDb5Container() { - super("mariadb:5.5.60"); + super("mariadb:5.5.61"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java index 758e6b33..20624bc1 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java @@ -85,7 +85,7 @@ public class MySql5JdbcOperationsSessionRepositoryITests private static class MySql5Container extends MySQLContainer { MySql5Container() { - super("mysql:5.7.22"); + super("mysql:5.7.23"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java index 31ae0076..7524e1aa 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java @@ -85,7 +85,7 @@ public class MySql8JdbcOperationsSessionRepositoryITests private static class MySql8Container extends MySQLContainer { MySql8Container() { - super("mysql:8.0.11"); + super("mysql:8.0.12"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java index a93e1168..6684cd6f 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class PostgreSql10JdbcOperationsSessionRepositoryITests extends PostgreSQLContainer { PostgreSql10Container() { - super("postgres:10.4"); + super("postgres:10.5"); } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java index 41187e3a..c863319c 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class PostgreSql9JdbcOperationsSessionRepositoryITests extends PostgreSQLContainer { PostgreSql9Container() { - super("postgres:9.6.9"); + super("postgres:9.6.10"); } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java index 1269650e..700c5f1b 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class SqlServerJdbcOperationsSessionRepositoryITests extends MSSQLServerContainer { SqlServer2007Container() { - super("microsoft/mssql-server-linux:2017-CU8"); + super("microsoft/mssql-server-linux:2017-CU9"); withStartupTimeoutSeconds(240); withConnectTimeoutSeconds(240); } 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 f9c54354..86fa592c 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 @@ -microsoft/mssql-server-linux:2017-CU8 +microsoft/mssql-server-linux:2017-CU9