Skip to content

Commit

Permalink
Merge pull request wildfly#18166 from jamezp/WFLY-19589
Browse files Browse the repository at this point in the history 
[WFLY-19589] Upgrade the MicroProfile REST Client to 4.0 and the RESTEasy implementation to 3.0.0.Final.
  • Loading branch information
@bstansberry
bstansberry authored Sep 13, 2024
2 parents 8674b8e + b06dc4a commit 89e0b0e
Show file tree
Hide file tree
Showing 10 changed files with 390 additions and 74 deletions.
51 changes: 51 additions & 0 deletions boms/preview-expansion/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@

<name>WildFly Preview: Dependency Management (Expansion Dependencies)</name>

<properties>
<version.org.eclipse.microprofile.rest.client.api>4.0</version.org.eclipse.microprofile.rest.client.api>
<version.org.jboss.resteasy.microprofile>3.0.0.Final</version.org.jboss.resteasy.microprofile>
</properties>

<dependencyManagement>
<dependencies>

Expand All @@ -55,6 +60,52 @@

<!-- Dependencies specific to this bom. Keep sorted -->

<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
<version>${version.org.eclipse.microprofile.rest.client.api}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.resteasy.microprofile</groupId>
<artifactId>microprofile-config</artifactId>
<version>${version.org.jboss.resteasy.microprofile}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy.microprofile</groupId>
<artifactId>microprofile-rest-client</artifactId>
<version>${version.org.jboss.resteasy.microprofile}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy.microprofile</groupId>
<artifactId>microprofile-rest-client-base</artifactId>
<version>${version.org.jboss.resteasy.microprofile}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
85 changes: 84 additions & 1 deletion boms/preview-test-expansion/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@

<name>WildFly Preview: Dependency Management (Expansion Test Dependencies)</name>

<properties/>
<properties>
<version.org.eclipse.jetty>11.0.20</version.org.eclipse.jetty>
<version.org.eclipse.microprofile.rest.client.api>4.0</version.org.eclipse.microprofile.rest.client.api>
<version.org.jboss.resteasy.microprofile>3.0.0.Final</version.org.jboss.resteasy.microprofile>
<version.org.testng>7.10.2</version.org.testng>
</properties>

<dependencyManagement>
<dependencies>
Expand All @@ -49,6 +54,84 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Test only dependencies -->
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-tck</artifactId>
<version>${version.org.eclipse.microprofile.rest.client.api}</version>
<scope>test</scope>
<!-- Don't exclude all TCK dependencies, only specific ones that cause problems -->
</dependency>

<!-- Required by Wiremock for the MicroProfile REST Client TCK -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
<version>${version.org.eclipse.jetty}</version>
<scope>test</scope>
</dependency>
<!-- End requirement -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.org.testng}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>${version.org.wiremock}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
-->
<version.com.beust>1.78</version.com.beust>
<version.com.github.tomakehurst.wiremock>2.27.2</version.com.github.tomakehurst.wiremock>
<version.org.wiremock>3.9.1</version.org.wiremock>
<version.dom4j>2.1.4</version.dom4j>
<version.httpunit>1.7.3</version.httpunit>
<legacy.version.io.netty>4.0.19.Final</legacy.version.io.netty>
Expand Down
4 changes: 4 additions & 0 deletions testsuite/integration/microprofile-tck/reactive-streams-operators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<!-- This TCK uses TestNG internal types which have been removed, Explictily it uses org.testng.internal.ObjectFactoryImpl.
For this reason we need to explicitly override the version.
-->
<version>7.4.0</version>
<scope>test</scope>
</dependency>

Expand Down
50 changes: 50 additions & 0 deletions testsuite/integration/microprofile-tck/rest-client/config/preview/module.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version='1.0' encoding='UTF-8'?>

<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->

<module xmlns="urn:jboss:module:1.9" name="org.wiremock">

<resources>
<resource-root path="wiremock.jar"/>
<resource-root path="junit.jar"/>
<resource-root path="jetty-http.jar"/>
<resource-root path="jetty-io.jar"/>
<resource-root path="jetty-server.jar"/>
<resource-root path="jetty-util.jar"/>
<resource-root path="httpclient5.jar"/>
<resource-root path="httpcore5.jar"/>
<resource-root path="httpcore5-h2.jar"/>
<resource-root path="http2-common.jar"/>
<resource-root path="http2-hpack.jar"/>
</resources>

<dependencies>
<module name="org.apache.httpcomponents"/>
<module name="org.apache.httpcomponents.core" export="true"/>
<module name="com.google.guava"/>
<module name="org.apache.commons.lang3"/>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8"/>
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310"/>
<module name="org.jboss.weld.core"/>
<module name="org.jboss.weld.spi"/>
<module name="jakarta.enterprise.api"/>
<module name="jakarta.inject.api"/>
<module name="jakarta.annotation.api"/>
<module name="jakarta.servlet.api"/>
<module name="org.jboss.resteasy.resteasy-cdi" services="export" export="true">
<imports>
<include path="META-INF"/>
</imports>
<exports>
<include path="META-INF"/>
</exports>
</module>
<module name="org.slf4j"/>
</dependencies>
</module>
2 changes: 1 addition & 1 deletion testsuite/integration/microprofile-tck/rest-client/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
~ SPDX-License-Identifier: Apache-2.0
-->

<module xmlns="urn:jboss:module:1.9" name="com.github.tomakehurst.wiremock">
<module xmlns="urn:jboss:module:1.9" name="org.wiremock">

<resources>
<resource-root path="wiremock.jar"/>
Expand Down
Loading

0 comments on commit 89e0b0e

Please sign in to comment.