Merge pull request #4086 from rsvoboda/restassured.awaitility.update

Limiting JUnit 4 and Hamcrest 1.3 usage
quarkusio · Sep 21, 2019 · d27fc3f · d27fc3f
2 parents 3421fd3 + 0cd690b
commit d27fc3f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -109,7 +109,7 @@
         <mariadb-jdbc.version>2.4.3</mariadb-jdbc.version>
         <mssql-jdbc.version>7.2.1.jre8</mssql-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
-        <rest-assured.version>3.3.0</rest-assured.version>
+        <rest-assured.version>4.1.1</rest-assured.version>
         <junit.jupiter.version>5.5.2</junit.jupiter.version>
         <assertj.version>3.13.2</assertj.version>
         <json-smart.version>2.3</json-smart.version>
@@ -137,7 +137,7 @@
         <maven-artifact-transfer.version>0.10.0</maven-artifact-transfer.version>
         <jline.version>2.14.6</jline.version>
         <maven-invoker.version>3.0.1</maven-invoker.version>
-        <awaitility.version>3.1.6</awaitility.version>
+        <awaitility.version>4.0.1</awaitility.version>
         <jprocesses.version>1.6.5</jprocesses.version>
         <jboss-logmanager.version>1.0.3</jboss-logmanager.version>
         <jgit.version>5.4.3.201909031940-r</jgit.version>

diff --git a/...s/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java b/...s/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RestEasyDevModeTestCase.java
@@ -30,7 +30,7 @@ public void testRESTeasyHotReplacement() {
                 .when()
                 .post("/post")
                 .then()
-                .content(Matchers.equalTo("Hello: Stuart"));
+                .body(Matchers.equalTo("Hello: Stuart"));
         test.modifySourceFile(PostResource.class, new Function<String, String>() {
             @Override
             public String apply(String s) {
@@ -41,6 +41,6 @@ public String apply(String s) {
                 .when()
                 .post("/post")
                 .then()
-                .content(Matchers.equalTo("Hi: Stuart"));
+                .body(Matchers.equalTo("Hi: Stuart"));
     }
 }
diff --git a/integration-tests/maven/src/it/setup-on-existing-pom-it/pom.xml b/integration-tests/maven/src/it/setup-on-existing-pom-it/pom.xml
@@ -23,9 +23,9 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.5.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/maven/src/it/setup-with-custom-quarkus-version-it/pom.xml b/integration-tests/maven/src/it/setup-with-custom-quarkus-version-it/pom.xml
@@ -22,9 +22,9 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.5.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java
@@ -26,10 +26,10 @@
 import de.flapdoodle.embed.process.runtime.Network;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.restassured.common.mapper.TypeRef;
 import io.restassured.mapper.ObjectMapper;
 import io.restassured.mapper.ObjectMapperDeserializationContext;
 import io.restassured.mapper.ObjectMapperSerializationContext;
-import io.restassured.mapper.TypeRef;
 import io.restassured.response.Response;
 
 @QuarkusTest