JAMES-2486 Upgrade com.jayway.awaitility to org.awaitility
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0a356975 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0a356975 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0a356975 Branch: refs/heads/master Commit: 0a356975a595674e119eac4ed992dc123e7d3bc6 Parents: 69bb4de Author: Gautier DI FOLCO <[email protected]> Authored: Thu Jul 19 14:24:56 2018 +0200 Committer: benwa <[email protected]> Committed: Tue Jul 31 09:25:35 2018 +0700 ---------------------------------------------------------------------- backends-common/elasticsearch/pom.xml | 8 ++++---- .../es/ClientProviderImplConnectionTest.java | 3 +-- .../backends/es/EmbeddedElasticSearch.java | 6 +++--- mailbox/cassandra/pom.xml | 10 +++++----- mailbox/tika/pom.xml | 10 +++++----- mpt/core/pom.xml | 8 ++++---- .../james/mpt/session/ExternalSession.java | 5 ++--- mpt/impl/imap-mailbox/cyrus/pom.xml | 2 +- .../mpt/imapmailbox/cyrus/host/Docker.java | 3 ++- .../apache/james/mpt/smtp/ForwardSmtpTest.java | 11 +++++------ pom.xml | 5 +++++ server/container/guice/cassandra-guice/pom.xml | 8 ++++---- .../CassandraMailRepositoryIntegrationTest.java | 9 ++++----- .../java/org/apache/james/ESReporterTest.java | 12 ++++++------ .../guice/cassandra-ldap-guice/pom.xml | 10 +++++----- .../james/CassandraLdapJamesServerTest.java | 9 ++++----- server/container/guice/guice-common/pom.xml | 8 ++++---- server/container/guice/jpa-guice/pom.xml | 8 ++++---- .../org/apache/james/JPAJamesServerTest.java | 6 +++--- server/container/guice/jpa-smtp/pom.xml | 20 +++++++++++++++----- .../apache/james/metric/es/ESReporterTest.java | 4 ++-- server/data/data-jmap-cassandra/pom.xml | 10 +++++----- server/data/data-jmap/pom.xml | 10 +++++----- .../AbstractNotificationRegistryTest.java | 2 +- ...ResolutionRemoteDeliveryIntegrationTest.java | 2 +- .../GatewayRemoteDeliveryIntegrationTest.java | 3 +-- .../james/mailets/configuration/Constants.java | 10 +++++----- .../james/smtp/SmtpAuthorizedAddressesTest.java | 3 +-- .../mailets/GroupMappingRelayTest.java | 3 +-- .../james/transport/mailets/amqp/AmqpRule.java | 2 +- .../org/apache/james/jmap/TestingConstants.java | 11 ++++++----- .../jmap/VacationRelayIntegrationTest.java | 2 +- .../integration/ForwardIntegrationTest.java | 8 ++++---- .../integration/SetMessagesMethodTest.java | 2 +- .../integration/SpamAssassinContract.java | 2 +- server/protocols/jmap/pom.xml | 10 +++++----- server/queue/queue-rabbitmq/pom.xml | 8 ++++---- .../queue/rabbitmq/RabbitMQClusterTest.java | 4 ++-- .../james/queue/rabbitmq/RabbitMQFixture.java | 10 +++++----- server/testing/pom.xml | 8 ++++---- .../java/org/apache/james/utils/FakeSmtp.java | 2 +- .../apache/james/utils/IMAPMessageReader.java | 2 +- 42 files changed, 144 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/backends-common/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml index cd5a0bf..6d8d071 100644 --- a/backends-common/elasticsearch/pom.xml +++ b/backends-common/elasticsearch/pom.xml @@ -49,10 +49,6 @@ <artifactId>throwing-lambdas</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -62,6 +58,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> <version>2.2.1</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java index 7ff3b74..aa0a8e9 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java @@ -22,6 +22,7 @@ package org.apache.james.backends.es; import java.util.concurrent.TimeUnit; import org.apache.james.util.docker.SwarmGenericContainer; +import org.awaitility.Awaitility; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilders; import org.junit.Ignore; @@ -30,8 +31,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jayway.awaitility.Awaitility; - @Ignore("JAMES-1952") public class ClientProviderImplConnectionTest { private static final Logger LOGGER = LoggerFactory.getLogger(ClientProviderImplConnectionTest.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java index 721d9e7..3bca71c 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java @@ -19,13 +19,15 @@ package org.apache.james.backends.es; -import static com.jayway.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import static org.elasticsearch.node.NodeBuilder.nodeBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.function.Supplier; +import org.awaitility.Duration; +import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.admin.indices.flush.FlushAction; import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder; import org.elasticsearch.client.Client; @@ -34,8 +36,6 @@ import org.elasticsearch.node.Node; import org.junit.rules.ExternalResource; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class EmbeddedElasticSearch extends ExternalResource { private final Supplier<Path> folder; private Node node; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index fb2f3c9..dd20476 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -115,11 +115,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> @@ -148,6 +143,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mailbox/tika/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index a4936fd..fc595d8 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -68,11 +68,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> @@ -97,6 +92,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mpt/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml index bb4a86d..1ebad5a 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -36,10 +36,6 @@ <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> @@ -67,6 +63,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java index 72b85b1..c9981c7 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java @@ -29,9 +29,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.james.mpt.api.Monitor; import org.apache.james.mpt.api.Session; - -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; +import org.awaitility.Awaitility; +import org.awaitility.Duration; public final class ExternalSession implements Session { http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mpt/impl/imap-mailbox/cyrus/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml index e29e5c8..a6d4385 100644 --- a/mpt/impl/imap-mailbox/cyrus/pom.xml +++ b/mpt/impl/imap-mailbox/cyrus/pom.xml @@ -36,7 +36,7 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> + <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java index 0eeb63a..f79cb88 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java @@ -23,9 +23,10 @@ import java.net.Socket; import java.net.UnknownHostException; import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.jayway.awaitility.Awaitility; import com.spotify.docker.client.DefaultDockerClient; import com.spotify.docker.client.exceptions.DockerException; import com.spotify.docker.client.messages.ContainerConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java index 174d6df..e30d555 100644 --- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java +++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java @@ -18,22 +18,21 @@ ****************************************************************/ package org.apache.james.mpt.smtp; -import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; -import static com.jayway.awaitility.Duration.ONE_MINUTE; +import static org.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; +import static org.awaitility.Duration.ONE_MINUTE; import static org.hamcrest.Matchers.equalTo; import java.util.Locale; import org.apache.james.mpt.script.SimpleScriptedTestProtocol; import org.apache.james.utils.FakeSmtp; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; - public abstract class ForwardSmtpTest { public static final String USER = "bob"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 06ab442..3ef1c08 100644 --- a/pom.xml +++ b/pom.xml @@ -2289,6 +2289,11 @@ <version>3.2.0</version> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> <version>1.60</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index d0c4100..77bd32b 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -237,10 +237,6 @@ <artifactId>logback-elasticsearch-appender</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> @@ -260,6 +256,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> <version>2.1.4</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java index f935d38..3be4457 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java @@ -19,7 +19,7 @@ package org.apache.james; -import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; +import static org.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; import java.util.concurrent.TimeUnit; @@ -27,16 +27,15 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.MailRepositoryProbeImpl; import org.apache.james.utils.SMTPMessageSender; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; - public class CassandraMailRepositoryIntegrationTest { private static final MailRepositoryUrl SENDER_DENIED_URL = MailRepositoryUrl.from("cassandra://var/mail/sender-denied/"); http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java index d598ed3..d9b709c 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java @@ -18,12 +18,16 @@ ****************************************************************/ package org.apache.james; -import static com.jayway.awaitility.Awaitility.await; import static io.restassured.RestAssured.given; import static io.restassured.config.EncoderConfig.encoderConfig; import static io.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; +import static org.awaitility.Awaitility.await; + +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; import java.net.InetAddress; import java.nio.charset.StandardCharsets; @@ -37,6 +41,7 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.modules.TestESMetricReporterModule; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.JmapGuiceProbe; +import org.awaitility.Duration; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilders; import org.junit.After; @@ -47,11 +52,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jayway.awaitility.Duration; -import io.restassured.RestAssured; -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.http.ContentType; - public class ESReporterTest { private static final int IMAP_PORT = 1143; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/cassandra-ldap-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index 9ce1c8e..30b5382 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -109,11 +109,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> @@ -124,6 +119,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java index 723f357..5954d0d 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java @@ -19,8 +19,8 @@ package org.apache.james; -import static com.jayway.awaitility.Duration.ONE_HUNDRED_MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS; import java.io.IOException; @@ -30,14 +30,13 @@ import org.apache.james.user.ldap.LdapGenericContainer; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; import org.apache.james.utils.SpoolerProbe; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; - public class CassandraLdapJamesServerTest extends AbstractJmapJamesServerTest { private static final String JAMES_USER = "james-user"; private static final String PASSWORD = "secret"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/guice-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 74664c2..6d33d6d 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -181,10 +181,6 @@ <artifactId>guice-multibindings</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> @@ -199,6 +195,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/jpa-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index db9c1da..8c23831 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -155,10 +155,6 @@ <artifactId>logback-elasticsearch-appender</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> @@ -178,6 +174,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index 75c7c6b..fac0a80 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -30,14 +30,14 @@ import org.apache.james.server.core.configuration.Configuration; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.common.base.Strings; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; public class JPAJamesServerTest extends AbstractJamesServerTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/guice/jpa-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 4144d06..7732821 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -68,11 +68,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> @@ -94,6 +89,21 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java ---------------------------------------------------------------------- diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java index 14edded..bd85668 100644 --- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java +++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java @@ -19,7 +19,7 @@ package org.apache.james.metric.es; -import static com.jayway.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import java.util.Timer; import java.util.TimerTask; @@ -33,6 +33,7 @@ import org.apache.james.metrics.es.ESMetricReporter; import org.apache.james.metrics.es.ESReporterConfiguration; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; +import org.awaitility.Duration; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilders; import org.junit.After; @@ -41,7 +42,6 @@ import org.junit.Rule; import org.junit.Test; import com.codahale.metrics.MetricRegistry; -import com.jayway.awaitility.Duration; public class ESReporterTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/data/data-jmap-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index 472bcda..201c98b 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -59,11 +59,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -78,6 +73,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/data/data-jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index d3583b8..a859470 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -51,11 +51,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -74,6 +69,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java index 111ecab..029405e 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.api.vacation; -import static com.jayway.awaitility.Awaitility.await; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java index 27058f5..f48587f 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java @@ -46,6 +46,7 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.FakeSmtp; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; +import org.awaitility.Duration; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -53,7 +54,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; -import com.jayway.awaitility.Duration; public class DirectResolutionRemoteDeliveryIntegrationTest { private static final String JAMES_ANOTHER_DOMAIN = "james.com"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java index d9e6bab..9da3345 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java @@ -43,14 +43,13 @@ import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.FakeSmtp; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; +import org.awaitility.Duration; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class GatewayRemoteDeliveryIntegrationTest { private static final String JAMES_ANOTHER_DOMAIN = "james.com"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java index 813b3ca..ee95d3e 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/Constants.java @@ -19,14 +19,14 @@ package org.apache.james.mailets.configuration; -import static com.jayway.awaitility.Duration.ONE_HUNDRED_MILLISECONDS; -import static com.jayway.awaitility.Duration.ONE_MINUTE; +import static org.awaitility.Duration.ONE_HUNDRED_MILLISECONDS; +import static org.awaitility.Duration.ONE_MINUTE; import java.util.concurrent.TimeUnit; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; public class Constants { public static Duration slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java index 8d7d661..1248a04 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java @@ -44,14 +44,13 @@ import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; import org.apache.james.utils.SMTPSendingException; import org.apache.james.utils.SmtpSendingStep; +import org.awaitility.Duration; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - public class SmtpAuthorizedAddressesTest { private static final String FROM = "fromuser@" + DEFAULT_DOMAIN; private static final String TO = "[email protected]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java index 62a295c..b9842a1 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java @@ -49,14 +49,13 @@ import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.routes.GroupsRoutes; import org.apache.mailet.base.test.FakeMail; +import org.awaitility.Duration; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.awaitility.Duration; - import io.restassured.specification.RequestSpecification; public class GroupMappingRelayTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java index 8198236..1527888 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java @@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.james.util.docker.SwarmGenericContainer; +import org.awaitility.Awaitility; import org.junit.rules.ExternalResource; -import com.jayway.awaitility.Awaitility; import com.rabbitmq.client.BuiltinExchangeType; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java index 3b756fd..bb9705a 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java @@ -22,14 +22,15 @@ package org.apache.james.jmap; import static io.restassured.config.EncoderConfig.encoderConfig; import static io.restassured.config.RestAssuredConfig.newConfig; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; + import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.http.ContentType; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; public interface TestingConstants { Duration slowPacedPollInterval = Duration.ONE_HUNDRED_MILLISECONDS; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index 903e47e..050f9e0 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -19,11 +19,11 @@ package org.apache.james.jmap; -import static com.jayway.awaitility.Duration.ONE_MINUTE; import static org.apache.james.jmap.TestingConstants.DOMAIN; import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP; import static org.apache.james.jmap.TestingConstants.SMTP_PORT; import static org.apache.james.jmap.TestingConstants.calmlyAwait; +import static org.awaitility.Duration.ONE_MINUTE; import static org.hamcrest.Matchers.equalTo; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java index 1befee7..00264be 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java @@ -39,6 +39,9 @@ import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import io.restassured.RestAssured; +import io.restassured.specification.RequestSpecification; + import java.io.IOException; import java.util.concurrent.TimeUnit; @@ -50,15 +53,12 @@ import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.SMTPMessageSender; import org.apache.james.utils.WebAdminGuiceProbe; import org.apache.james.webadmin.WebAdminUtils; +import org.awaitility.Duration; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import com.jayway.awaitility.Duration; -import io.restassured.RestAssured; -import io.restassured.specification.RequestSpecification; - public abstract class ForwardIntegrationTest { @Rule http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 43be5d0..6f100b2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -112,6 +112,7 @@ import org.apache.james.utils.MessageIdProbe; import org.apache.james.utils.SMTPMessageSender; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; +import org.awaitility.Duration; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.After; @@ -122,7 +123,6 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; -import com.jayway.awaitility.Duration; import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java index c07e0ec..dfcbdda 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java @@ -43,10 +43,10 @@ import org.apache.james.mailbox.Role; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.JmapGuiceProbe; +import org.awaitility.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.jayway.awaitility.Duration; import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 7a39157..31e1ec8 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -200,11 +200,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> <scope>test</scope> @@ -252,6 +247,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/queue/queue-rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml index 7ad50f8..3f7e708 100644 --- a/server/queue/queue-rabbitmq/pom.xml +++ b/server/queue/queue-rabbitmq/pom.xml @@ -57,10 +57,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.rabbitmq</groupId> <artifactId>amqp-client</artifactId> </dependency> @@ -70,6 +66,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java index 63146a9..f03b646 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java @@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; import org.apache.james.queue.rabbitmq.DockerClusterRabbitMQExtension.DockerRabbitMQCluster; +import org.awaitility.Awaitility; +import org.awaitility.Duration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -50,8 +52,6 @@ import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import com.github.fge.lambdas.Throwing; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; import com.rabbitmq.client.Address; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQFixture.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQFixture.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQFixture.java index 3ed6237..d13523f 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQFixture.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQFixture.java @@ -19,12 +19,12 @@ package org.apache.james.queue.rabbitmq; -import static com.jayway.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; -import static com.jayway.awaitility.Duration.ONE_MINUTE; +import static org.awaitility.Duration.FIVE_HUNDRED_MILLISECONDS; +import static org.awaitility.Duration.ONE_MINUTE; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.Duration; -import com.jayway.awaitility.core.ConditionFactory; +import org.awaitility.Awaitility; +import org.awaitility.Duration; +import org.awaitility.core.ConditionFactory; import com.rabbitmq.client.AMQP; public class RabbitMQFixture { http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/testing/pom.xml b/server/testing/pom.xml index 87aec19..50623d2 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -46,10 +46,6 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>com.jayway.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -63,6 +59,10 @@ <version>3.6.1</version> </dependency> <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + </dependency> + <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java ---------------------------------------------------------------------- diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java index 1f5f042..167a0a7 100644 --- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java +++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java @@ -28,12 +28,12 @@ import java.util.function.Function; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; +import org.awaitility.core.ConditionFactory; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; -import com.jayway.awaitility.core.ConditionFactory; import io.restassured.builder.RequestSpecBuilder; import io.restassured.builder.ResponseSpecBuilder; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java ---------------------------------------------------------------------- diff --git a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java index b03492c..078b583 100644 --- a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java +++ b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java @@ -24,11 +24,11 @@ import java.io.IOException; import java.util.List; import org.apache.commons.net.imap.IMAPClient; +import org.awaitility.core.ConditionFactory; import org.junit.rules.ExternalResource; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; -import com.jayway.awaitility.core.ConditionFactory; public class IMAPMessageReader extends ExternalResource implements Closeable { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
