JAMES-1889 Upgrade testcontainers
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d995e6af Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d995e6af Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d995e6af Branch: refs/heads/master Commit: d995e6af3fba8cda103e2a5ee8654f11916f2372 Parents: 5caeecc Author: Antoine Duprat <adup...@linagora.com> Authored: Mon Dec 19 10:30:28 2016 +0100 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Dec 21 09:52:09 2016 +0100 ---------------------------------------------------------------------- .../org/apache/james/util/streams/SwarmGenericContainer.java | 4 ++-- server/pom.xml | 2 +- .../src/test/java/org/apache/james/jmap/ContainerTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d995e6af/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java b/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java index ddfb7f2..a9943bf 100644 --- a/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java +++ b/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java @@ -27,7 +27,7 @@ import org.testcontainers.containers.GenericContainer; import com.google.common.base.Strings; -public class SwarmGenericContainer extends GenericContainer { +public class SwarmGenericContainer extends GenericContainer<SwarmGenericContainer> { private static final Logger LOGGER = LoggerFactory.getLogger(SwarmGenericContainer.class); private static final String DOCKER_CONTAINER = "DOCKER_CONTAINER"; @@ -36,7 +36,7 @@ public class SwarmGenericContainer extends GenericContainer { super(dockerImageName); } - public GenericContainer withAffinityToContainer() { + public GenericContainer<SwarmGenericContainer> withAffinityToContainer() { String container = System.getenv(DOCKER_CONTAINER); if (Strings.isNullOrEmpty(container)) { LOGGER.warn("'DOCKER_CONTAINER' environment variable not found, dockering without affinity"); http://git-wip-us.apache.org/repos/asf/james-project/blob/d995e6af/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index b56f35d..fb62822 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -186,7 +186,7 @@ <cassandra-unit.version>2.1.9.2</cassandra-unit.version> <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.3.0</assertj-3.version> - <testcontainers-version>1.0.2</testcontainers-version> + <testcontainers-version>1.1.7</testcontainers-version> <guavate.version>1.0.0</guavate.version> <metrics.version>3.1.0</metrics.version> </properties> http://git-wip-us.apache.org/repos/asf/james-project/blob/d995e6af/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java index 7c56e44..194930a 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java @@ -29,11 +29,11 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.james.util.streams.SwarmGenericContainer; import org.junit.Rule; import org.junit.Test; -import org.testcontainers.containers.GenericContainer; public class ContainerTest { - @Rule public GenericContainer container = new SwarmGenericContainer("nginx:1.7.1") + @Rule + public SwarmGenericContainer container = new SwarmGenericContainer("nginx:1.7.1") .withAffinityToContainer() .withExposedPorts(80); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
