JAMES-2487 Upgrade com.jayway.restassured to io.restassured 3.1.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/89df9a44 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/89df9a44 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/89df9a44 Branch: refs/heads/master Commit: 89df9a447fbff03e4068c45377de5d58174a386e Parents: 7d00538 Author: Gautier DI FOLCO <[email protected]> Authored: Mon Jul 23 12:04:27 2018 +0200 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:07 2018 +0700 ---------------------------------------------------------------------- mpt/impl/smtp/core/pom.xml | 2 +- pom.xml | 4 +-- server/container/guice/cassandra-guice/pom.xml | 10 +++--- .../java/org/apache/james/ESReporterTest.java | 12 ++++---- .../apache/james/FixingGhostMailboxTest.java | 16 +++++----- .../guice/cassandra-ldap-guice/pom.xml | 2 +- server/container/guice/guice-common/pom.xml | 10 +++--- server/container/guice/jpa-guice/pom.xml | 10 +++--- server/container/guice/jpa-smtp/pom.xml | 2 +- server/container/guice/memory-guice/pom.xml | 2 +- server/container/guice/protocols/jmap/pom.xml | 2 +- .../james/AbstractJmapJamesServerTest.java | 12 ++++---- server/container/jetty/pom.xml | 10 +++--- .../james/http/jetty/JettyHttpServerTest.java | 4 +-- server/mailet/integration-testing/pom.xml | 8 ++--- .../transport/mailets/DlpIntegrationTest.java | 4 +-- .../transport/mailets/GroupMappingTest.java | 16 ++++++---- .../mailets/IsOverQuotaMatcherTest.java | 4 +-- .../transport/mailets/ToRepositoryTest.java | 4 +-- .../cassandra-jmap-integration-testing/pom.xml | 10 +++--- .../cassandra/CassandraBulkOperationTest.java | 6 ++-- .../jmap-integration-testing-common/pom.xml | 10 +++--- .../james/jmap/JMAPAuthenticationTest.java | 8 ++--- .../apache/james/jmap/JmapCommonRequests.java | 6 ++-- .../org/apache/james/jmap/ProvisioningTest.java | 6 ++-- .../org/apache/james/jmap/TestingConstants.java | 8 ++--- .../james/jmap/VacationIntegrationTest.java | 6 ++-- .../integration/ForwardIntegrationTest.java | 8 ++--- .../integration/GetMailboxesMethodTest.java | 4 +-- .../integration/GetMessageListMethodTest.java | 4 +-- .../integration/GetVacationResponseTest.java | 6 ++-- .../methods/integration/QuotaMailingTest.java | 8 ++--- .../methods/integration/SendMDNMethodTest.java | 8 ++--- .../integration/SetMailboxesMethodTest.java | 8 ++--- .../integration/SetMessagesMethodTest.java | 20 ++++++------ .../SetMessagesOutboxFlagUpdateTest.java | 16 +++++----- .../integration/SetVacationResponseTest.java | 6 ++-- .../integration/SpamAssassinContract.java | 16 +++++----- .../memory-jmap-integration-testing/pom.xml | 10 +++--- server/protocols/jmap/pom.xml | 10 +++--- .../org/apache/james/jmap/JMAPServletTest.java | 12 ++++---- .../protocols/webadmin-integration-test/pom.xml | 2 +- .../integration/JwtFilterIntegrationTest.java | 11 +++---- .../WebAdminServerIntegrationTest.java | 8 ++--- .../webadmin/webadmin-cassandra/pom.xml | 2 +- .../routes/CassandraMigrationRoutesTest.java | 10 +++--- server/protocols/webadmin/webadmin-core/pom.xml | 10 +++--- .../apache/james/webadmin/WebAdminUtils.java | 8 ++--- .../james/webadmin/routes/ErrorRoutesTest.java | 4 +-- .../james/webadmin/routes/TasksRoutesTest.java | 8 ++--- server/protocols/webadmin/webadmin-data/pom.xml | 2 +- .../routes/DLPConfigurationRoutesTest.java | 14 ++++----- .../routes/DomainMappingsRoutesTest.java | 20 ++++++------ .../webadmin/routes/DomainsRoutesTest.java | 10 +++--- .../webadmin/routes/ForwardRoutesTest.java | 12 ++++---- .../james/webadmin/routes/GroupsRoutesTest.java | 12 ++++---- .../webadmin/routes/SieveQuotaRoutesTest.java | 6 ++-- .../james/webadmin/routes/UsersRoutesTest.java | 10 +++--- .../protocols/webadmin/webadmin-mailbox/pom.xml | 2 +- .../DomainQuotaRoutesNoVirtualHostingTest.java | 4 +-- .../webadmin/routes/DomainQuotaRoutesTest.java | 10 +++--- .../webadmin/routes/GlobalQuotaRoutesTest.java | 10 +++--- .../routes/UserMailboxesRoutesTest.java | 8 ++--- .../webadmin/routes/UserQuotaRoutesTest.java | 12 ++++---- .../routes/WebAdminQuotaSearchTestSystem.java | 2 +- .../webadmin/webadmin-mailqueue/pom.xml | 2 +- .../webadmin/routes/MailQueueRoutesTest.java | 20 ++++++------ .../webadmin/webadmin-mailrepository/pom.xml | 2 +- .../routes/MailRepositoriesRoutesTest.java | 32 ++++++++++---------- server/testing/pom.xml | 8 ++--- .../java/org/apache/james/utils/FakeSmtp.java | 18 +++++------ 71 files changed, 306 insertions(+), 303 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/mpt/impl/smtp/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml index d0f43bc..18174b0 100644 --- a/mpt/impl/smtp/core/pom.xml +++ b/mpt/impl/smtp/core/pom.xml @@ -58,7 +58,7 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af11b8b..22d9b76 100644 --- a/pom.xml +++ b/pom.xml @@ -1682,9 +1682,9 @@ <version>2.1.0</version> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> - <version>2.9.0</version> + <version>3.1.0</version> </dependency> <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 f93077c..d0c4100 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -241,15 +241,15 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 1c9995f..d598ed3 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 @@ -19,9 +19,9 @@ package org.apache.james; import static com.jayway.awaitility.Awaitility.await; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +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; @@ -48,9 +48,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.jayway.awaitility.Duration; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; public class ESReporterTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java index 9def511..1ebe05f 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java @@ -21,10 +21,10 @@ package org.apache.james; import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; +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.assertj.core.api.Assertions.assertThat; @@ -73,10 +73,10 @@ import org.junit.Test; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.specification.RequestSpecification; public class FixingGhostMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 f74dfae..9ce1c8e 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -114,7 +114,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 cec5b46..a426fc7 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -180,15 +180,15 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 9dda918..db9c1da 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -159,15 +159,15 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.nurkiewicz.asyncretry</groupId> <artifactId>asyncretry</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 c332036..42f7ca5 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -73,7 +73,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> <exclusions> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index e7e0c84..e24dd76 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -148,7 +148,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml index 0769a63..ead0455 100644 --- a/server/container/guice/protocols/jmap/pom.xml +++ b/server/container/guice/protocols/jmap/pom.xml @@ -67,7 +67,7 @@ <artifactId>guice-multibindings</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java index fb510be..3e10b05 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -37,9 +37,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; public abstract class AbstractJmapJamesServerTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/jetty/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml index bacbfab..4087769 100644 --- a/server/container/jetty/pom.xml +++ b/server/container/jetty/pom.xml @@ -46,15 +46,15 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java b/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java index 17cb1f4..7f31411 100644 --- a/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java +++ b/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java @@ -19,7 +19,7 @@ package org.apache.james.http.jetty; -import static com.jayway.restassured.RestAssured.when; +import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -41,7 +41,7 @@ import org.junit.Before; import org.junit.Test; import com.google.common.io.Closeables; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class JettyHttpServerTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 48fd691..4f6e5a0 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -125,13 +125,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> + <groupId>com.rabbitmq</groupId> + <artifactId>amqp-client</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java index aae098e..697d90e 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.FROM; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; @@ -57,7 +57,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import com.google.inject.util.Modules; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.specification.RequestSpecification; public class DlpIntegrationTest { public static final String REPOSITORY_PREFIX = "file://var/mail/dlp/quarantine/"; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 45bbcd8..dd501cd 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; @@ -60,7 +60,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.restassured.specification.RequestSpecification; +import com.jayway.awaitility.Duration; + +import io.restassured.specification.RequestSpecification; public class GroupMappingTest { private static final String DOMAIN1 = "domain1.com"; @@ -502,9 +504,11 @@ public class GroupMappingTest { .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)); - fakeSmtp.isReceived(response -> response - .body("[0].from", equalTo(SENDER)) - .body("[0].to[0]", equalTo(externalMail)) - .body("[0].text", equalTo(MESSAGE_CONTENT))); + awaitAtMostOneMinute + .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS) + .until(() -> fakeSmtp.isReceived(response -> response + .body("[0].from", equalTo(SENDER)) + .body("[0].to[0]", equalTo(externalMail)) + .body("[0].text", equalTo(MESSAGE_CONTENT)))); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java index 6b755fb..e0f9e16 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; @@ -49,7 +49,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.specification.RequestSpecification; public class IsOverQuotaMatcherTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java index 3bcff8c..def9542 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.with; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; @@ -49,7 +49,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.specification.RequestSpecification; public class ToRepositoryTest { private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index d0ad077..986f7db 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -138,11 +138,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-guice</artifactId> <scope>test</scope> @@ -158,6 +153,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java index 6d56aff..a360649 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.cassandra; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ARGUMENTS; import static org.apache.james.jmap.TestingConstants.DOMAIN; @@ -55,8 +55,8 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.parsing.Parser; public class CassandraBulkOperationTest { private static final Integer NUMBER_OF_MAIL_TO_CREATE = 250; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 5bd752b..0adc13f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -118,11 +118,6 @@ <artifactId>json-path</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-guice</artifactId> <scope>test</scope> @@ -138,6 +133,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java index 1f3492e..406ce41 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.jmap; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.equalTo; @@ -40,8 +40,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; public abstract class JMAPAuthenticationTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java index 3a90326..ef61472 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java @@ -19,7 +19,7 @@ package org.apache.james.jmap; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.with; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasKey; @@ -33,8 +33,8 @@ import java.util.Map; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.Role; -import com.jayway.restassured.builder.ResponseSpecBuilder; -import com.jayway.restassured.specification.ResponseSpecification; +import io.restassured.builder.ResponseSpecBuilder; +import io.restassured.specification.ResponseSpecification; public class JmapCommonRequests { private static final String NAME = "[0][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java index 7194ad4..b0b9af6 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; @@ -42,7 +42,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public abstract class ProvisioningTest { private static final String NAME = "[0][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 9949c61..3b756fd 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 @@ -19,8 +19,8 @@ package org.apache.james.jmap; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; @@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit; import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; public interface TestingConstants { Duration slowPacedPollInterval = Duration.ONE_HUNDRED_MILLISECONDS; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 3148050..36d1e02 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ARGUMENTS; @@ -53,7 +53,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public abstract class VacationIntegrationTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 d91876a..1befee7 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 @@ -19,8 +19,8 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes; @@ -56,8 +56,8 @@ import org.junit.Rule; import org.junit.Test; import com.jayway.awaitility.Duration; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.specification.RequestSpecification; public abstract class ForwardIntegrationTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 9cbc885..05e3d45 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ALICE; @@ -83,7 +83,7 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public abstract class GetMailboxesMethodTest { public static final String READ = String.valueOf(Right.Read.asCharacter()); http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 8780771..f1643a4 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ALICE; @@ -76,7 +76,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public abstract class GetMessageListMethodTest { public static final int LIMIT_TO_3_MESSAGES = 3; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java index 0fe102f..86a2859 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ALICE; @@ -48,8 +48,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; public abstract class GetVacationResponseTest { public static final String SUBJECT = "subject"; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java index 420a18e..ceae1b3 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount; @@ -54,8 +54,8 @@ import org.junit.Before; import org.junit.Test; import com.google.common.base.Strings; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.parsing.Parser; public abstract class QuotaMailingTest { private static final String HOMER = "homer@" + DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index e272ea7..a3bf893 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapCommonRequests.getInboxId; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; @@ -65,8 +65,8 @@ import org.junit.Before; import org.junit.Test; import com.google.common.collect.Iterables; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.parsing.Parser; public abstract class SendMDNMethodTest { private static final String HOMER = "homer@" + DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index dae7e9e..c0ce1e7 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ARGUMENTS; @@ -68,7 +68,7 @@ import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public abstract class SetMailboxesMethodTest { @@ -564,7 +564,7 @@ public abstract class SetMailboxesMethodTest { with() .header("Authorization", accessToken.serialize()) .body(requestBody) - .then() + .when() .post("/jmap"); given() http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 24ba7fd..22ca5f8 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 @@ -19,10 +19,10 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.jmap.JmapCommonRequests.getDraftId; import static org.apache.james.jmap.JmapCommonRequests.getInboxId; import static org.apache.james.jmap.JmapCommonRequests.getMailboxId; @@ -123,10 +123,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; import com.jayway.awaitility.Duration; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.parsing.Parser; public abstract class SetMessagesMethodTest { private static final String FORWARDED = "$Forwarded"; @@ -3913,7 +3913,7 @@ public abstract class SetMessagesMethodTest { return with() .header("Authorization", accessToken.serialize()) .contentType(attachment.getType()) - .content(attachment.getStream()) + .body(attachment.getStream()) .post("/upload") .then() .extract() @@ -3926,7 +3926,7 @@ public abstract class SetMessagesMethodTest { return with() .header("Authorization", accessToken.serialize()) .contentType(attachment.getType()) - .content(new String(IOUtils.toByteArray(attachment.getStream()), StandardCharsets.UTF_8)) + .body(new String(IOUtils.toByteArray(attachment.getStream()), StandardCharsets.UTF_8)) .post("/upload") .then() .extract() http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java index eb01780..31aa417 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java @@ -19,10 +19,10 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.jmap.JmapCommonRequests.getOutboxId; import static org.apache.james.jmap.JmapCommonRequests.getSetMessagesUpdateOKResponseAssertions; import static org.apache.james.jmap.JmapURIBuilder.baseUri; @@ -55,10 +55,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.parsing.Parser; public abstract class SetMessagesOutboxFlagUpdateTest { private static final String USERNAME = "username@" + DOMAIN; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java index a5c5ad8..46f5067 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ARGUMENTS; @@ -45,8 +45,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; public abstract class SetVacationResponseTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 8a2a62c..c07e0ec 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 @@ -19,10 +19,10 @@ package org.apache.james.jmap.methods.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.with; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.with; +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.apache.james.jmap.TestingConstants.ARGUMENTS; @@ -47,10 +47,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.jayway.awaitility.Duration; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.parsing.Parser; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.parsing.Parser; public interface SpamAssassinContract { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index aab80ae..db2c09c 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -107,11 +107,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-guice</artifactId> <scope>test</scope> @@ -127,6 +122,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 9e4873a..eeb3252 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -208,15 +208,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java index 1c753fd..666bcc3 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.jmap; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.RestAssured.given; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -44,9 +44,9 @@ import org.junit.Test; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; public class JMAPServletTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index ae10057..fdcb4bd 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -91,7 +91,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java index 116f849..fc3a958 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java @@ -19,7 +19,7 @@ package org.apache.james.webadmin.integration; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.assertj.core.api.Assertions.assertThat; @@ -43,8 +43,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Header; +import io.restassured.RestAssured; public class JwtFilterIntegrationTest { @@ -95,7 +94,7 @@ public class JwtFilterIntegrationTest { @Test public void jwtAuthenticationShouldWork() throws Exception { given() - .header(new Header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_TRUE)) + .header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_TRUE) .when() .put(SPECIFIC_DOMAIN) .then() @@ -108,7 +107,7 @@ public class JwtFilterIntegrationTest { @Test public void jwtShouldRejectNonAdminRequests() throws Exception { given() - .header(new Header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_FALSE)) + .header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_FALSE) .when() .put(SPECIFIC_DOMAIN) .then() @@ -121,7 +120,7 @@ public class JwtFilterIntegrationTest { @Test public void jwtShouldRejectInvalidRequests() throws Exception { given() - .header(new Header("Authorization", "Bearer invalid")) + .header("Authorization", "Bearer invalid") .when() .put(SPECIFIC_DOMAIN) .then() http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index b385f6f..b706323 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.integration; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.assertj.core.api.Assertions.assertThat; @@ -53,7 +53,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class WebAdminServerIntegrationTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index 8bb1a2e..27f6450 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -53,7 +53,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java index b3f1fc9..1df072f 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; @@ -56,8 +56,8 @@ import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.ImmutableMap; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; public class CassandraMigrationRoutesTest { private static final SchemaVersion LATEST_VERSION = new SchemaVersion(3); http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 99f8b14..3755875 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -83,15 +83,15 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jaxrs</artifactId> <version>1.5.13</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java index 8d5534a..7a984eb 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java @@ -19,8 +19,8 @@ package org.apache.james.webadmin; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static io.restassured.config.EncoderConfig.encoderConfig; +import static io.restassured.config.RestAssuredConfig.newConfig; import java.nio.charset.StandardCharsets; @@ -29,8 +29,8 @@ import org.apache.james.util.Port; import org.apache.james.webadmin.authentication.NoAuthenticationFilter; import com.google.common.collect.ImmutableSet; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; public class WebAdminUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java index ffdb07a..943e15c 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java @@ -19,7 +19,7 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.when; +import static io.restassured.RestAssured.when; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.apache.james.webadmin.routes.ErrorRoutes.INTERNAL_SERVER_ERROR; import static org.apache.james.webadmin.routes.ErrorRoutes.JSON_EXTRACT_EXCEPTION; @@ -38,7 +38,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class ErrorRoutesTest { private static final String NOT_FOUND = "notFound"; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java index 8964c87..b65a84f 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; @@ -44,7 +44,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class TasksRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 70a25a5..69bbd37 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -83,7 +83,7 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> + <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java index 49b6614..b1e51a6 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java @@ -19,10 +19,10 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.requestSpecification; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.requestSpecification; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; @@ -49,9 +49,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.specification.RequestSpecification; class DLPConfigurationRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java index 0d36762..a1646c3 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java @@ -19,11 +19,11 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.delete; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.put; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.delete; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.put; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; @@ -59,11 +59,11 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.filter.log.LogDetail; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.filter.log.LogDetail; +import io.restassured.http.ContentType; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; class DomainMappingsRoutesTest { private RecipientRewriteTable recipientRewriteTable; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index 7c83988..a243f56 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; @@ -49,8 +49,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; public class DomainsRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java index 41fdb95..558bf5c 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; +import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; @@ -59,9 +59,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.filter.log.LogDetail; -import com.jayway.restassured.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.filter.log.LogDetail; +import io.restassured.http.ContentType; class ForwardRoutesTest { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
