Merge pull request #6704 from quarkusio/dependabot/maven/rest-assured…

….version-4.2.0 Bump rest-assured.version from 4.1.2 to 4.2.0
quarkusio · Jan 23, 2020 · 0696812 · 0696812
2 parents adba14f + 17a6aaf
commit 0696812
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -113,7 +113,7 @@
         <mssql-jdbc.version>7.2.1.jre8</mssql-jdbc.version>
         <derby-jdbc.version>10.14.2.0</derby-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
-        <rest-assured.version>4.1.2</rest-assured.version>
+        <rest-assured.version>4.2.0</rest-assured.version>
         <junit.jupiter.version>5.6.0</junit.jupiter.version>
         <testng.version>6.14.2</testng.version>
         <assertj.version>3.14.0</assertj.version>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -273,7 +273,7 @@
                                         </excludes>
                                         <includes>
                                             <!-- this is for REST Assured -->
-                                            <include>javax.xml.bind:jaxb-api:*:*:test</include>
+                                            <include>jakarta.xml.bind:jakarta.xml.bind-api:*:*:test</include>
                                         </includes>
                                     </bannedDependencies>
                                 </rules>

diff --git a/integration-tests/elytron-security-oauth2/pom.xml b/integration-tests/elytron-security-oauth2/pom.xml
@@ -49,6 +49,10 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

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
@@ -20,6 +20,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.common.mapper.TypeRef;
+import io.restassured.config.ObjectMapperConfig;
 import io.restassured.mapper.ObjectMapper;
 import io.restassured.mapper.ObjectMapperDeserializationContext;
 import io.restassured.mapper.ObjectMapperSerializationContext;
@@ -45,7 +46,7 @@ public Object serialize(ObjectMapperSerializationContext context) {
                 return jsonb.toJson(context.getObjectToSerialize());
             }
         };
-        RestAssured.objectMapper(mapper);
+        RestAssured.config().objectMapperConfig(ObjectMapperConfig.objectMapperConfig().defaultObjectMapper(mapper));
     }
 
     @AfterAll

diff --git a/tcks/microprofile-metrics/rest/pom.xml b/tcks/microprofile-metrics/rest/pom.xml
@@ -54,8 +54,8 @@
                     <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

diff --git a/tcks/microprofile-openapi/pom.xml b/tcks/microprofile-openapi/pom.xml
@@ -61,8 +61,8 @@
                     <artifactId>javax.ws.rs-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>javax.servlet</groupId>