This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 128b66329657155b938950b8a427be69ee18cee7 Author: Tung Tran <[email protected]> AuthorDate: Tue Aug 1 11:22:56 2023 +0700 [CLEAN CODE] - Maven testcontainers resolve deprecated method --- .../org/apache/james/backends/cassandra/CassandraWaitStrategy.java | 2 +- .../java/org/apache/james/backends/cassandra/DockerCassandra.java | 2 +- .../test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java | 2 +- pom.xml | 2 +- .../src/main/java/org/apache/james/util/docker/DockerContainer.java | 2 +- .../linshare/src/test/java/org/apache/james/linshare/Linshare.java | 4 ++-- .../java/org/apache/james/spamassassin/SpamAssassinExtension.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java index 3e56fdf756..f3bd034ac4 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java @@ -52,7 +52,7 @@ public class CassandraWaitStrategy implements WaitStrategy { Unreliables.retryUntilTrue(Ints.checkedCast(timeout.getSeconds()), TimeUnit.SECONDS, () -> { try { ClusterFactory.createWithoutKeyspace(ClusterConfiguration.builder() - .host(Host.from(cassandraContainer.getContainerIpAddress(), cassandraContainer.getMappedPort(9042))) + .host(Host.from(cassandraContainer.getHost(), cassandraContainer.getMappedPort(9042))) .username("cassandra") .password("cassandra") .maxRetry(1) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java index 2fae9fa8f3..d654529c82 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java @@ -224,7 +224,7 @@ public class DockerCassandra { } public String getIp() { - return cassandraContainer.getContainerIpAddress(); + return cassandraContainer.getHost(); } public int getBindingPort() { diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java index e776056a32..e2abe1a9ba 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java @@ -109,7 +109,7 @@ public class DockerRabbitMQ { } private String getHostIp() { - return container.getContainerIpAddress(); + return container.getHost(); } private Integer getPort() { diff --git a/pom.xml b/pom.xml index 4b3c31b283..98f69234a4 100644 --- a/pom.xml +++ b/pom.xml @@ -630,7 +630,7 @@ <feign-form.version>3.8.0</feign-form.version> <jjwt.version>0.11.5</jjwt.version> <metrics.version>4.2.19</metrics.version> - <testcontainers.version>1.17.6</testcontainers.version> + <testcontainers.version>1.18.3</testcontainers.version> <es.version>2.2.1</es.version> <es-reporter.version>6.0.0-RC3</es-reporter.version> <guava.version>32.1.1-jre</guava.version> diff --git a/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java b/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java index c4c271e852..af64205e63 100644 --- a/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java +++ b/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java @@ -193,7 +193,7 @@ public class DockerContainer implements TestRule, BeforeAllCallback, AfterAllCal } public String getHostIp() { - return container.getContainerIpAddress(); + return container.getHost(); } @Override diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java index 3f9a1de59d..0cb758a5a9 100644 --- a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java +++ b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java @@ -86,7 +86,7 @@ public class Linshare { } public String getIp() { - return linshareBackend.getContainerIpAddress(); + return linshareBackend.getHost(); } public String getUrl() { @@ -182,7 +182,7 @@ public class Linshare { .setAccept(ContentType.JSON) .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8))) .setPort(linshareSmtp.getMappedPort(80)) - .setBaseUri("http://"; + linshareSmtp.getContainerIpAddress()) + .setBaseUri("http://"; + linshareSmtp.getHost()) .build(); } } diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java index 2120de5aa4..8efc103812 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java @@ -100,7 +100,7 @@ public class SpamAssassinExtension implements BeforeAllCallback, AfterEachCallba private SpamAssassin(GenericContainer<?> spamAssassinContainer) { this.spamAssassinContainer = spamAssassinContainer; - this.ip = spamAssassinContainer.getContainerIpAddress(); + this.ip = spamAssassinContainer.getHost(); this.bindingPort = spamAssassinContainer.getMappedPort(SPAMASSASSIN_PORT); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
