Skip to content

Commit

Permalink
Only enable JAX-RS TCK if -Ptck-jax-rs (like on CI) is active
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzo1
rzo1 committed Apr 23, 2024
1 parent 19bc653 commit 25b2e36
Show file tree
Hide file tree
Showing 4 changed files with 252 additions and 226 deletions.
129 changes: 69 additions & 60 deletions tck/jax-rs/jax-rs-signature-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,66 +71,75 @@
</exclusions>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>copy-tck-cdi-api-signature-file</id>
<phase>generate-test-sources</phase>
<goals>
<goal>unpack</goal>
</goals>

<profiles>
<profile>
<id>tck-jax-rs</id>
<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>copy-tck-cdi-api-signature-file</id>
<phase>generate-test-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta-restful-ws-tck</artifactId>
<version>${jaxrs.tck.version}</version>
<overWrite>true</overWrite>
<includes>**/jakarta.ws.rs.sig_3.1.0</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/api-signature</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<id>sigtest</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta-restful-ws-tck</artifactId>
<version>${jaxrs.tck.version}</version>
<overWrite>true</overWrite>
<includes>**/jakarta.ws.rs.sig_3.1.0</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/api-signature</outputDirectory>
<sigfile>
${project.build.directory}/api-signature/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.1.0
</sigfile>
<packages>
jakarta.ws.rs,jakarta.ws.rs.client,jakarta.ws.rs.container,jakarta.ws.rs.core,jakarta.ws.rs.ext,jakarta.ws.rs.see
</packages>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<id>sigtest</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<sigfile>${project.build.directory}/api-signature/ee/jakarta/tck/ws/rs/signaturetest/jakarta.ws.rs.sig_3.1.0
</sigfile>
<packages>jakarta.ws.rs,jakarta.ws.rs.client,jakarta.ws.rs.container,jakarta.ws.rs.core,jakarta.ws.rs.ext,jakarta.ws.rs.see</packages>
</configuration>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
145 changes: 75 additions & 70 deletions tck/jax-rs/jax-rs-tests-embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,79 +83,84 @@
</dependency>
</dependencies>

<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<useFile>false</useFile>
<disableXmlReport>false</disableXmlReport>
<profiles>
<profile>
<id>tck-jax-rs</id>
<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<useFile>false</useFile>
<disableXmlReport>false</disableXmlReport>

<!--Hint: Default naming of surefire is not followed.-->
<includes>
<include>**/*.java</include>
</includes>
<!--Hint: Default naming of surefire is not followed.-->
<includes>
<include>**/*.java</include>
</includes>

<excludes>
<!--
SeBootstrap is stated as an optional component for containers.
It is also only listed as a Java-SE Publication Mechanism in the Specification (2.3.1.2).
Therefore, we exclude its IT.
-->
<exclude>**/SeBootstrapIT.java</exclude>
<!-- We have an own module for signature-Tests-->
<exclude>**/JAXRSSigTestIT.java</exclude>
<excludes>
<!--
SeBootstrap is stated as an optional component for containers.
It is also only listed as a Java-SE Publication Mechanism in the Specification (2.3.1.2).
Therefore, we exclude its IT.
-->
<exclude>**/SeBootstrapIT.java</exclude>
<!-- We have an own module for signature-Tests-->
<exclude>**/JAXRSSigTestIT.java</exclude>

<!-- TODO: TOMEE-4321 / CXF-9005
ee.jakarta.tck.ws.rs.jaxrs31.spec.extensions.JAXRSClientIT#featureIsRegisteredTest
ee.jakarta.tck.ws.rs.jaxrs31.spec.extensions.JAXRSClientIT#dynamicFeatureIsRegisteredTest
ee.jakarta.tck.ws.rs.spec.contextprovider.JsonbContextProviderIT#shouldUseApplicationProvidedJsonbInstance
-->
<exclude>**/JAXRSClientIT.java</exclude>
<exclude>**/JsonbContextProviderIT.java</exclude>
</excludes>
<!-- TODO: TOMEE-4321 / CXF-9005
ee.jakarta.tck.ws.rs.jaxrs31.spec.extensions.JAXRSClientIT#featureIsRegisteredTest
ee.jakarta.tck.ws.rs.jaxrs31.spec.extensions.JAXRSClientIT#dynamicFeatureIsRegisteredTest
ee.jakarta.tck.ws.rs.spec.contextprovider.JsonbContextProviderIT#shouldUseApplicationProvidedJsonbInstance
-->
<exclude>**/JAXRSClientIT.java</exclude>
<exclude>**/JsonbContextProviderIT.java</exclude>
</excludes>

<dependenciesToScan>
<dependency>jakarta.ws.rs:jakarta-restful-ws-tck</dependency>
</dependenciesToScan>
<dependenciesToScan>
<dependency>jakarta.ws.rs:jakarta-restful-ws-tck</dependency>
</dependenciesToScan>

<systemPropertyVariables>
<servlet_adaptor>org.apache.openejb.server.rest.OpenEJBRestServlet</servlet_adaptor>
<webServerHost>localhost</webServerHost>
<webServerPort>8080</webServerPort>
<porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL
</porting.ts.url.class.1>
<org.apache.cxf.transport.http.forceURLConnection>true
</org.apache.cxf.transport.http.forceURLConnection>
<openejb.jaxrs.fail-on-constrainedto>false</openejb.jaxrs.fail-on-constrainedto>
<tomee.embedded.tck.enable_tracing>true</tomee.embedded.tck.enable_tracing>
<user>j2ee</user>
<password>j2ee</password>
<authuser>javajoe</authuser>
<authpassword>javajoe</authpassword>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
<systemPropertyVariables>
<servlet_adaptor>org.apache.openejb.server.rest.OpenEJBRestServlet</servlet_adaptor>
<webServerHost>localhost</webServerHost>
<webServerPort>8080</webServerPort>
<porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL
</porting.ts.url.class.1>
<org.apache.cxf.transport.http.forceURLConnection>true
</org.apache.cxf.transport.http.forceURLConnection>
<openejb.jaxrs.fail-on-constrainedto>false</openejb.jaxrs.fail-on-constrainedto>
<tomee.embedded.tck.enable_tracing>true</tomee.embedded.tck.enable_tracing>
<user>j2ee</user>
<password>j2ee</password>
<authuser>javajoe</authuser>
<authpassword>javajoe</authpassword>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit 25b2e36

Please sign in to comment.