This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch mp7 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d67e3746418a8e9ffe1a75e58367c8b8f4d504c9 Author: Richard Zowalla <[email protected]> AuthorDate: Tue Mar 17 19:59:36 2026 +0100 Rest Client 4.0 TCK: all 235 tests pass (11 skipped) - Upgrade WireMock from 2.27.2 to 3.13.1 (org.wiremock groupId) - Upgrade WireMock Maven plugin from 3.0.0 to 7.3.0 with wiremock-standalone - Remove manual Jetty 9.2 dependencies (WireMock 3.x bundles Jetty 11) - Upgrade TestNG from 7.5.1 to 7.10.2 - Add httpcore5 dependency for SslContextTest - Remove SSE test exclusion (javax servlet API issue fixed in 4.0) --- tck/microprofile-tck/rest-client/pom.xml | 81 ++++++---------------- .../MicroProfileRestClientTCKArchiveProcessor.java | 1 + tck/microprofile-tck/rest-client/tck-suite.xml | 2 - 3 files changed, 21 insertions(+), 63 deletions(-) diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml index 440a33f9c0..793a511e79 100644 --- a/tck/microprofile-tck/rest-client/pom.xml +++ b/tck/microprofile-tck/rest-client/pom.xml @@ -29,8 +29,7 @@ <name>TomEE :: TCK :: MicroProfile Rest Client TCK</name> <properties> - <!-- Note: This old version is needed for the MP Rest Client TCK--> - <jetty-tck.version>9.2.28.v20190418</jetty-tck.version> + <wiremock.version>3.13.1</wiremock.version> </properties> <build> @@ -39,10 +38,17 @@ <plugin> <groupId>uk.co.automatictester</groupId> <artifactId>wiremock-maven-plugin</artifactId> - <version>3.0.0</version> + <version>7.3.0</version> + <dependencies> + <dependency> + <groupId>org.wiremock</groupId> + <artifactId>wiremock-standalone</artifactId> + <version>${wiremock.version}</version> + </dependency> + </dependencies> <configuration> <dir>target/classes</dir> - <params>--port=8765 --verbose</params> + <params>--port=8765 --disable-banner=true</params> </configuration> <executions> <execution> @@ -164,68 +170,14 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> + <version>7.10.2</version> <scope>test</scope> </dependency> <dependency> - <groupId>com.github.tomakehurst</groupId> + <groupId>org.wiremock</groupId> <artifactId>wiremock</artifactId> - <version>2.27.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty-tck.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>${jetty-tck.version}</version> + <version>${wiremock.version}</version> <scope>test</scope> </dependency> @@ -271,6 +223,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> + <version>5.4.2</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java index 623f4365bb..a8df833504 100644 --- a/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java +++ b/tck/microprofile-tck/rest-client/src/test/java/org/apache/tomee/microprofile/tck/restclient/MicroProfileRestClientTCKArchiveProcessor.java @@ -40,6 +40,7 @@ public class MicroProfileRestClientTCKArchiveProcessor implements ApplicationArc webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.util.component.LifeCycle.class)); webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.http.HttpField.class)); webArchive.addAsLibrary(JarLocation.jarLocation(org.eclipse.jetty.io.ByteBufferPool.class)); + webArchive.addAsLibrary(JarLocation.jarLocation(org.apache.hc.core5.ssl.SSLContextBuilder.class)); webArchive.addAsWebInfResource(new StringAsset(""), "beans.xml"); final Map<ArchivePath, Node> content = webArchive.getContent(); diff --git a/tck/microprofile-tck/rest-client/tck-suite.xml b/tck/microprofile-tck/rest-client/tck-suite.xml index 49ddb969fb..e997ef2a12 100644 --- a/tck/microprofile-tck/rest-client/tck-suite.xml +++ b/tck/microprofile-tck/rest-client/tck-suite.xml @@ -21,8 +21,6 @@ <test name="microprofile-rest-client TCK"> <packages> <package name="org.eclipse.microprofile.rest.client.tck.*"> - <!-- bug in MyEventSourceServlet which depends on javax servlet api, see https://github.com/eclipse/microprofile-rest-client/issues/316--> - <exclude name="org.eclipse.microprofile.rest.client.tck.sse.*"></exclude> <!-- will pass if run in solo mode --> <exclude name="org.eclipse.microprofile.rest.client.tck.jsonb.*"></exclude> </package>
