From c4daeff3d81bab2d5b885d61603159b4cb31b9ef Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Tue, 2 Jan 2018 21:20:26 +0100 Subject: [PATCH] Update integration tests This commit updates TestContainers dependency and versions of Docker images used in integration tests. --- gradle/dependency-management.gradle | 7 +++++-- .../integration-test/java/sample/FindByUsernameTests.java | 4 ++-- .../integration-test/java/sample/HttpRedisJsonTest.java | 4 ++-- .../integration-test/java/sample/RedisSerializerTest.java | 4 ++-- .../redis/src/integration-test/java/sample/BootTests.java | 4 ++-- .../src/integration-test/java/sample/AttributeTests.java | 4 ++-- .../websocket/src/test/java/sample/ApplicationTests.java | 4 ++-- .../src/main/java/sample/EmbeddedRedisConfig.java | 4 ++-- .../redis/src/main/java/sample/EmbeddedRedisConfig.java | 4 ++-- .../src/integration-test/java/rest/RestMockMvcTests.java | 4 ++-- .../rest/src/main/java/sample/EmbeddedRedisConfig.java | 4 ++-- .../security/src/main/java/sample/EmbeddedRedisConfig.java | 4 ++-- .../redis/src/main/java/sample/EmbeddedRedisConfig.java | 4 ++-- .../session/data/redis/AbstractRedisITests.java | 4 ++-- .../MariaDB10JdbcOperationsSessionRepositoryITests.java | 4 ++-- 15 files changed, 33 insertions(+), 30 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 9ba421c6..e5a9974c 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -13,13 +13,16 @@ dependencyManagement { entry 'hazelcast-client' } - dependencySet(group: 'org.testcontainers', version: '1.4.3') { - entry 'mariadb' + dependencySet(group: 'org.testcontainers', version: '1.5.1') { entry 'mysql' entry 'postgresql' entry 'testcontainers' } + dependencySet(group: 'org.testcontainers', version: '1.4.3') { + entry 'mariadb' + } + dependency 'com.h2database:h2:1.4.196' dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' dependency 'io.lettuce:lettuce-core:5.0.1.RELEASE' 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 17a9ec07..af6110d6 100644 --- a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java +++ b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @ContextConfiguration(initializers = FindByUsernameTests.Initializer.class) public class FindByUsernameTests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 b95a1668..98820829 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 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(initializers = HttpRedisJsonTest.Initializer.class) public class HttpRedisJsonTest { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 62ab9cbf..175d6454 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 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(initializers = RedisSerializerTest.Initializer.class) public class RedisSerializerTest { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 b46c0c87..24be4f38 100644 --- a/samples/boot/redis/src/integration-test/java/sample/BootTests.java +++ b/samples/boot/redis/src/integration-test/java/sample/BootTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @ContextConfiguration(initializers = BootTests.Initializer.class) public class BootTests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 0011f232..41322bbe 100644 --- a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java +++ b/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(initializers = AttributeTests.Initializer.class) public class AttributeTests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) diff --git a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java index 1046ab38..41bfd02d 100644 --- a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java +++ b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport; @ContextConfiguration(initializers = ApplicationTests.Initializer.class) public class ApplicationTests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 5e5265cc..fc11571b 100644 --- a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2"; + private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6"; @Bean(initMethod = "start") 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 5e5265cc..fc11571b 100644 --- a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2"; + private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6"; @Bean(initMethod = "start") 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 de5f0a8c..a8bca0cf 100644 --- a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java +++ b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration public class RestMockMvcTests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) diff --git a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java index 5e5265cc..fc11571b 100644 --- a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2"; + private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6"; @Bean(initMethod = "start") 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 5e5265cc..fc11571b 100644 --- a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2"; + private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6"; @Bean(initMethod = "start") 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 5e5265cc..fc11571b 100644 --- a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2"; + private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6"; @Bean(initMethod = "start") 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 9c7a19d2..366bc151 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 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor */ public abstract class AbstractRedisITests { - private static final String DOCKER_IMAGE = "redis:4.0.2"; + private static final String DOCKER_IMAGE = "redis:4.0.6"; @ClassRule public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) 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 efb02228..2fd0f420 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 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import org.springframework.test.context.web.WebAppConfiguration; public class MariaDB10JdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests { - private static final String DOCKER_IMAGE = "mariadb:10.2.10"; + private static final String DOCKER_IMAGE = "mariadb:10.2.11"; @ClassRule public static MariaDBContainer mariaDBContainer = new MariaDBContainer(DOCKER_IMAGE);