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/GroupsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index 09ae779..0c09d5b 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.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; @@ -58,9 +58,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 GroupsRoutesTest {
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/SieveQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java index a5ebd5a..27dbee3 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java @@ -19,7 +19,7 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; @@ -36,8 +36,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; 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 SieveQuotaRoutesTest { 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/UsersRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index 873f246..a7bed25 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.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.mockito.Matchers.any; @@ -50,8 +50,8 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.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; class UsersRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index c4ca76d..033f413 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -129,7 +129,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-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java index 0700cef..b1500c3 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java @@ -19,7 +19,7 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import org.apache.james.core.Domain; @@ -40,7 +40,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import com.google.common.collect.ImmutableSet; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; class DomainQuotaRoutesNoVirtualHostingTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java index db58a6b..1d6f458 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java @@ -19,8 +19,8 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; @@ -35,9 +35,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.path.json.JsonPath; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.path.json.JsonPath; @ExtendWith(ScanningQuotaSearchExtension.class) class DomainQuotaRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java index 25bd32e..48b4534 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java @@ -19,8 +19,8 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.RestAssured.when; +import static io.restassured.RestAssured.given; +import static io.restassured.RestAssured.when; import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; @@ -34,9 +34,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.path.json.JsonPath; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.path.json.JsonPath; @ExtendWith(ScanningQuotaSearchExtension.class) class GlobalQuotaRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 1b457c4..003d407 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -19,8 +19,8 @@ package org.apache.james.webadmin.routes; -import static com.jayway.restassured.RestAssured.when; -import static com.jayway.restassured.RestAssured.with; +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.apache.james.webadmin.routes.UserMailboxesRoutes.USERS_BASE; @@ -60,8 +60,8 @@ 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.http.ContentType; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; class UserMailboxesRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java index a2299ca..fd759bb 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.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 net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; @@ -57,9 +57,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import com.google.common.base.Strings; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.path.json.JsonPath; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.path.json.JsonPath; class UserQuotaRoutesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java index 75f8d26..9a791c0 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java @@ -32,7 +32,7 @@ import org.apache.james.webadmin.service.UserQuotaService; import org.apache.james.webadmin.utils.JsonTransformer; import com.google.common.collect.ImmutableSet; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.specification.RequestSpecification; public class WebAdminQuotaSearchTestSystem { private final QuotaSearchTestSystem quotaSearchTestSystem; http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailqueue/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml index f82f3d9..962b011 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml +++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml @@ -73,7 +73,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-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java index 3cfaef9..1811b83 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java @@ -19,11 +19,11 @@ 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 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.when; +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.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.empty; @@ -60,10 +60,10 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import com.github.steveash.guavate.Guavate; -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 MailQueueRoutesTest { @@ -520,7 +520,7 @@ public class MailQueueRoutesTest { with() .queryParam("delayed", "true") .body("{\"delayed\": \"false\"}") - .then() + .when() .patch(FIRST_QUEUE + "/mails"); assertThat(queue.browse()) http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailrepository/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml index c77b2f8..1c30113 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml +++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml @@ -96,7 +96,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-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index c451ff4..f930d5d 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.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 net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; @@ -91,10 +91,10 @@ import org.mockito.stubbing.Answer; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; -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 class MailRepositoriesRoutesTest { @@ -151,7 +151,7 @@ public class MailRepositoriesRoutesTest { @Test public void putMailRepositoryShouldReturnOkWhenRepositoryIsCreated() throws Exception { given() - .parameters("protocol", "url") + .params("protocol", "url") .when() .put(PATH_ESCAPED_MY_REPO) .then() @@ -164,14 +164,14 @@ public class MailRepositoriesRoutesTest { @Test public void putMailRepositoryShouldReturnOkWhenRepositoryAlreadyExists() throws Exception { given() - .parameters("protocol", "url") + .params("protocol", "url") .when() .put(PATH_ESCAPED_MY_REPO) .then() .statusCode(HttpStatus.NO_CONTENT_204); given() - .parameters("protocol", "url") + .params("protocol", "url") .when() .put(PATH_ESCAPED_MY_REPO) .then() @@ -187,7 +187,7 @@ public class MailRepositoriesRoutesTest { .thenThrow(new MailRepositoryStore.MailRepositoryStoreException("Error while selecting repository url://myRepo")); given() - .parameters("protocol", "url") + .params("protocol", "url") .when() .put(PATH_ESCAPED_MY_REPO) .then() @@ -584,7 +584,7 @@ public class MailRepositoriesRoutesTest { String jsonAsString = given() - .parameters("additionalFields", "attributes,headers,textBody,htmlBody,messageSize,perRecipientsHeaders") + .params("additionalFields", "attributes,headers,textBody,htmlBody,messageSize,perRecipientsHeaders") .when() .get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1) .then() @@ -651,7 +651,7 @@ public class MailRepositoriesRoutesTest { .build()); given() - .parameters("additionalFields", ",,,messageSize") + .params("additionalFields", ",,,messageSize") .when() .get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1) .then() @@ -684,7 +684,7 @@ public class MailRepositoriesRoutesTest { .build()); given() - .parameters("additionalFields", "headers") + .params("additionalFields", "headers") .when() .get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1) .then() @@ -709,7 +709,7 @@ public class MailRepositoriesRoutesTest { .build()); given() - .parameters("additionalFields", "messageSize,messageSize") + .params("additionalFields", "messageSize,messageSize") .when() .get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1) .then() @@ -739,7 +739,7 @@ public class MailRepositoriesRoutesTest { .build()); given() - .parameters("additionalFields", "nonExistingField") + .params("additionalFields", "nonExistingField") .when() .get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1) .then() http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/testing/pom.xml b/server/testing/pom.xml index 69d8f4f..87aec19 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -50,14 +50,14 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> - <groupId>com.jayway.restassured</groupId> - <artifactId>rest-assured</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> <version>3.6.1</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/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 5013110..1f5f042 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 @@ -19,9 +19,9 @@ package org.apache.james.utils; -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 java.nio.charset.StandardCharsets; import java.util.function.Function; @@ -34,12 +34,12 @@ import org.junit.runners.model.Statement; import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; import com.jayway.awaitility.core.ConditionFactory; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.builder.ResponseSpecBuilder; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.response.ValidatableResponse; -import com.jayway.restassured.specification.RequestSpecification; -import com.jayway.restassured.specification.ResponseSpecification; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.builder.ResponseSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.response.ValidatableResponse; +import io.restassured.specification.RequestSpecification; +import io.restassured.specification.ResponseSpecification; public class FakeSmtp implements TestRule { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
