From 17a6aafa8af5594818f5839313c91cbc2b6f7d16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2020 20:39:17 +0000
Subject: [PATCH] Bump rest-assured.version from 4.1.2 to 4.2.0

Bumps `rest-assured.version` from 4.1.2 to 4.2.0.

Updates `rest-assured` from 4.1.2 to 4.2.0
- [Release notes](https://github.com/jayway/rest-assured/releases)
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/jayway/rest-assured/compare/rest-assured-4.1.2...rest-assured-4.2.0)

Updates `json-schema-validator` from 4.1.2 to 4.2.0

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 bom/runtime/pom.xml                                           | 2 +-
 build-parent/pom.xml                                          | 2 +-
 integration-tests/elytron-security-oauth2/pom.xml             | 4 ++++
 .../src/test/java/io/quarkus/it/mongodb/BookResourceTest.java | 3 ++-
 tcks/microprofile-metrics/rest/pom.xml                        | 4 ++--
 tcks/microprofile-openapi/pom.xml                             | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 1e9bdb062738c..2c63f676dc455 100644
--- 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
index f6e2f588c2bf0..801ef47a2ab52 100644
--- 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
index 34d887bb3b624..2da020841ecba 100644
--- 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
index b4d4029f76295..51d36a154df3f 100644
--- 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
index c38c376f1af44..c6e9a9ffde724 100644
--- 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
index d196f0a66638d..a94ae733ca17c 100644
--- 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>