Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rest-assured.version from 4.1.2 to 4.2.0 #6704

Merged
merged 1 commit into from Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/runtime/pom.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/elytron-security-oauth2/pom.xml
Expand Up @@ -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>
Expand Down
Expand Up @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tcks/microprofile-metrics/rest/pom.xml
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tcks/microprofile-openapi/pom.xml
Expand Up @@ -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>
Expand Down