JAMES-2334 Enforce common image usage for RabbitMQ
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/21eec770 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/21eec770 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/21eec770 Branch: refs/heads/master Commit: 21eec7701198a232ed9bd17b55a88f4dac083dbb Parents: 552e44d Author: benwa <[email protected]> Authored: Tue May 29 10:10:50 2018 +0700 Committer: Matthieu Baechler <[email protected]> Committed: Thu May 31 09:47:02 2018 +0200 ---------------------------------------------------------------------- .../src/test/java/org/apache/james/util/docker/Images.java | 2 +- server/queue/queue-rabbitmq/pom.xml | 6 ++++++ .../java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/21eec770/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java ---------------------------------------------------------------------- diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java b/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java index 7b75b45..549cf02 100644 --- a/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java +++ b/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java @@ -21,7 +21,7 @@ package org.apache.james.util.docker; public interface Images { String FAKE_SMTP = "weave/rest-smtp-sink:latest"; - String RABBITMQ = "rabbitmq:3"; + String RABBITMQ = "rabbitmq:3.7.5"; String ELASTICSEARCH = "elasticsearch:2.2.2"; String NGINX = "nginx:1.7.1"; String TIKA = "logicalspark/docker-tikaserver:1.15rc2"; http://git-wip-us.apache.org/repos/asf/james-project/blob/21eec770/server/queue/queue-rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml index 86bbfa2..c2fff5b 100644 --- a/server/queue/queue-rabbitmq/pom.xml +++ b/server/queue/queue-rabbitmq/pom.xml @@ -34,6 +34,12 @@ <dependencies> <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-util-java8</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/21eec770/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java index a964b99..d890c2b 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/DockerRabbitMQ.java @@ -20,6 +20,7 @@ package org.apache.james.queue.rabbitmq; import java.util.Optional; +import org.apache.james.util.docker.Images; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.DockerClientFactory; @@ -52,7 +53,7 @@ public class DockerRabbitMQ { @SuppressWarnings("resource") private DockerRabbitMQ(Optional<String> hostName, Optional<String> erlangCookie, Optional<String> nodeName, Optional<Network> net) { - container = new GenericContainer<>("rabbitmq:3.7.5") + container = new GenericContainer<>(Images.RABBITMQ) .withCreateContainerCmdModifier(cmd -> cmd.withName(hostName.orElse("localhost"))) .withCreateContainerCmdModifier(cmd -> cmd.withHostName(hostName.orElse(DEFAULT_RABBIT_NODE))) .withExposedPorts(DEFAULT_RABBITMQ_PORT) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
