From d120d3424f5b05fd19211bde2a861e52d9c6cd07 Mon Sep 17 00:00:00 2001 From: Johannes Beck Date: Sun, 9 Jun 2024 09:32:59 +0200 Subject: [PATCH] Small updates --- src/test/java/x1/arquillian/Containers.java | 14 ++++++++------ src/test/java/x1/arquillian/WildflyContainer.java | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/java/x1/arquillian/Containers.java b/src/test/java/x1/arquillian/Containers.java index ba34c16..2564a0e 100644 --- a/src/test/java/x1/arquillian/Containers.java +++ b/src/test/java/x1/arquillian/Containers.java @@ -4,7 +4,6 @@ import java.util.List; import org.jboss.arquillian.container.spi.ContainerRegistry; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; @@ -13,18 +12,21 @@ @ContainerDefinition public final class Containers implements ArquillianTestContainers { - private static final Logger LOGGER = LoggerFactory.getLogger(Containers.class); - private final Network network = Network.newNetwork(); + @SuppressWarnings("resource") private final GenericContainer database = new GenericContainer<>( - DockerImageName.parse("registry.x1/j7beck/x1-postgres-stomp-test:1.8")).withNetwork(network) - .withNetworkAliases("postgres").withLogConsumer(new Slf4jLogConsumer(LOGGER).withSeparateOutputStreams()); + DockerImageName.parse("registry.x1/j7beck/x1-postgres-stomp-test:1.8")) + .withNetwork(network) + .withNetworkAliases("postgres") + .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(Containers.class)).withSeparateOutputStreams()); - private final GenericContainer etcd = new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.13")) + @SuppressWarnings("resource") + private final GenericContainer etcd = new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.14")) .withEnv("ETCD_ENABLE_V2", "true").withNetwork(network).withNetworkAliases("etcd").withCommand("etcd", "--listen-client-urls", "http://0.0.0.0:2379", "--advertise-client-urls", "http://etcd:2379"); + @SuppressWarnings("resource") private final WildflyContainer wildfly = new WildflyContainer("registry.x1/j7beck/x1-wildfly-stomp-test-it:1.8") .dependsOn(database).dependsOn(etcd).withNetwork(network).withEnv("wildfly-testcontainers.properties"); diff --git a/src/test/java/x1/arquillian/WildflyContainer.java b/src/test/java/x1/arquillian/WildflyContainer.java index 4627e58..dd085d2 100644 --- a/src/test/java/x1/arquillian/WildflyContainer.java +++ b/src/test/java/x1/arquillian/WildflyContainer.java @@ -83,6 +83,8 @@ public WildflyContainer withJavaOpts(String javaOpts) { addFixedExposedPort(DEBUG_PORT, DEBUG_PORT); withEnv("JAVA_OPTS", javaOpts + " -agentlib:jdwp=transport=dt_socket,address=*:" + DEBUG_PORT + ",server=y,suspend=" + suspend); + } else { + withEnv("JAVA_OPTS", javaOpts); } return this; }