Skip to content

Commit

Permalink
Migrate to running the TCK with WildFly.
Browse files Browse the repository at this point in the history
Signed-off-by: James R. Perkins <[email protected]>
  • Loading branch information
jamezp committed Jun 26, 2024
1 parent e01fa4b commit f49d856
Show file tree
Hide file tree
Showing 9 changed files with 310 additions and 189 deletions.
18 changes: 2 additions & 16 deletions bom/test-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,10 @@

<!-- Required by the MicroProfile REST TCK -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>${version.com.github.tomakehurst.wiremock}</version>
<version>${version.org.wiremock}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<version.io.smallrye.smallrye-config>3.8.3</version.io.smallrye.smallrye-config>

<version.org.eclipse.microprofile.rest.client>4.0-RC1</version.org.eclipse.microprofile.rest.client>
<version.org.eclipse.microprofile.rest.client>4.0-RC2</version.org.eclipse.microprofile.rest.client>
<version.org.eclipse.microprofile.config>3.1</version.org.eclipse.microprofile.config>
<version.org.eclipse.microprofile.context-propagation>1.3</version.org.eclipse.microprofile.context-propagation>

Expand All @@ -72,7 +72,7 @@
<version.org.junit>5.10.2</version.org.junit>

<!-- Test only dependencies -->
<version.com.github.tomakehurst.wiremock>3.0.1</version.com.github.tomakehurst.wiremock>
<version.org.wiremock>3.7.0</version.org.wiremock>

<!-- Plugin Versions -->
<version.org.wildfly.maven.plugin>5.0.0.Final</version.org.wildfly.maven.plugin>
Expand Down
88 changes: 0 additions & 88 deletions testsuite/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,6 @@
<artifactId>integration-tests</artifactId>
<name>RESTEasy MicroProfile: Integration Tests</name>

<properties>
<!-- Galleon -->
<jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>

<!-- Feature Packs -->
<server.version/>
<wildfly.feature.pack.groupId>org.wildfly</wildfly.feature.pack.groupId>
<wildfly.feature.pack.artifactId>wildfly-galleon-pack</wildfly.feature.pack.artifactId>

<wildfly.channel.manifest.groupId>org.wildfly.channels</wildfly.channel.manifest.groupId>
<wildfly.channel.manifest.artifactId>wildfly</wildfly.channel.manifest.artifactId>

<resteasy.channel.manifest.groupId>dev.resteasy.channels</resteasy.channel.manifest.groupId>
<resteasy.channel.manifest.artifactId>resteasy-6.2</resteasy.channel.manifest.artifactId>
<resteasy.channel.manifest.version>${version.org.jboss.resteasy}</resteasy.channel.manifest.version>

<resteasy.mp.channel.manifest.groupId>dev.resteasy.channels</resteasy.mp.channel.manifest.groupId>
<resteasy.mp.channel.manifest.artifactId>resteasy-microprofile-${channel.stream.version}</resteasy.mp.channel.manifest.artifactId>
<resteasy.mp.channel.manifest.version>${project.version}</resteasy.mp.channel.manifest.version>

<jboss.arguments/>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
Expand Down Expand Up @@ -215,15 +192,6 @@
</dependencies>

<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<directory>src/test/resources/filtered</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -234,62 +202,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<provisioning-dir>${jboss.home}</provisioning-dir>
<offline>${galleon.offline}</offline>
<feature-packs>
<feature-pack>
<groupId>${wildfly.feature.pack.groupId}</groupId>
<artifactId>${wildfly.feature.pack.artifactId}</artifactId>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
</included-configs>
<excluded-packages>
<name>docs.schema</name>
<name>appclient</name>
<name>domain</name>
</excluded-packages>
</feature-pack>
</feature-packs>
<channels>
<!-- If the server.version is blank the newest version of WildFly will be used. Otherwise, be
explicit.
-->
<channel>
<manifest>
<groupId>${wildfly.channel.manifest.groupId}</groupId>
<artifactId>${wildfly.channel.manifest.artifactId}</artifactId>
<version>${server.version}</version>
</manifest>
</channel>
<channel>
<manifest>
<groupId>${resteasy.channel.manifest.groupId}</groupId>
<artifactId>${resteasy.channel.manifest.artifactId}</artifactId>
<version>${resteasy.channel.manifest.version}</version>
</manifest>
</channel>
<channel>
<manifest>
<groupId>${resteasy.mp.channel.manifest.groupId}</groupId>
<artifactId>${resteasy.mp.channel.manifest.artifactId}</artifactId>
<version>${resteasy.mp.channel.manifest.version}</version>
</manifest>
</channel>
</channels>
<galleon-options>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
<jboss-maven-dist/>
</galleon-options>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
10 changes: 10 additions & 0 deletions testsuite/microprofile-rest-client-tck/config/wildfly/beans.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans43_0.xsd"
version="4.0" bean-discovery-mode="all">
</beans>
64 changes: 64 additions & 0 deletions testsuite/microprofile-rest-client-tck/config/wildfly/module.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version='1.0' encoding='UTF-8'?>

<!--
~ JBoss, Home of Professional Open Source.
~
~ Copyright 2024 Red Hat, Inc., and individual contributors
~ as indicated by the @author tags.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
embed-server --admin-only=true

/subsystem=ee:list-add(name=global-modules,value={name=org.wiremock})
deployment-overlay add --name=tckOverlay --content=/WEB-INF/lib/*.jar/META-INF/beans.xml=${beansxml.path} --deployments=*.war --redeploy-affected
deployment-overlay add --name=tckWarOverlay --content=/WEB-INF//beans.xml=${beansxml.path} --deployments=*.war --redeploy-affected

stop-embedded-server
Loading

0 comments on commit f49d856

Please sign in to comment.