This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 25b2e36afc Only enable JAX-RS TCK if -Ptck-jax-rs (like on CI) is
active
25b2e36afc is described below
commit 25b2e36afc0f58fe797d31b0ebb535424675b10b
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Tue Apr 23 09:18:46 2024 +0200
Only enable JAX-RS TCK if -Ptck-jax-rs (like on CI) is active
---
tck/jax-rs/jax-rs-signature-test/pom.xml | 129 ++++++++++++++-------------
tck/jax-rs/jax-rs-tests-embedded/pom.xml | 145 ++++++++++++++++---------------
tck/jax-rs/jax-rs-tests/pom.xml | 143 +++++++++++++++---------------
tck/jax-rs/pom.xml | 61 +++++++------
4 files changed, 252 insertions(+), 226 deletions(-)
diff --git a/tck/jax-rs/jax-rs-signature-test/pom.xml
b/tck/jax-rs/jax-rs-signature-test/pom.xml
index 077f05b5de..ef26778cd4 100644
--- a/tck/jax-rs/jax-rs-signature-test/pom.xml
+++ b/tck/jax-rs/jax-rs-signature-test/pom.xml
@@ -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>
\ No newline at end of file
diff --git a/tck/jax-rs/jax-rs-tests-embedded/pom.xml
b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
index 430f84ffab..ea06e0fca8 100644
--- a/tck/jax-rs/jax-rs-tests-embedded/pom.xml
+++ b/tck/jax-rs/jax-rs-tests-embedded/pom.xml
@@ -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>
\ No newline at end of file
diff --git a/tck/jax-rs/jax-rs-tests/pom.xml b/tck/jax-rs/jax-rs-tests/pom.xml
index 092ccc1ceb..9c4221b6ff 100644
--- a/tck/jax-rs/jax-rs-tests/pom.xml
+++ b/tck/jax-rs/jax-rs-tests/pom.xml
@@ -100,80 +100,85 @@
</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>**/jaxrs31/spec/extensions/JAXRSClientIT.java</exclude>
-
<exclude>**/spec/contextprovider/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>**/jaxrs31/spec/extensions/JAXRSClientIT.java</exclude>
+
<exclude>**/spec/contextprovider/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>
- <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>
+ <user>j2ee</user>
+ <password>j2ee</password>
+ <authuser>javajoe</authuser>
+ <authpassword>javajoe</authpassword>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/tck/jax-rs/pom.xml b/tck/jax-rs/pom.xml
index 924e9a2b38..70d1bd0aba 100644
--- a/tck/jax-rs/pom.xml
+++ b/tck/jax-rs/pom.xml
@@ -34,32 +34,39 @@
<module>jax-rs-signature-test</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <!-- If you use proxy you need to set it as a
system properties -->
- <get skipexisting="true"
src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/jakarta-restful-ws-tck-${jaxrs.tck.version}.zip";
dest="jakarta-restful-ws-tck-${jaxrs.tck.version}.zip"/>
- <unzip
src="jakarta-restful-ws-tck-${jaxrs.tck.version}.zip" dest="./target"/>
- <chmod file="install-tck-artifact.sh"
perm="+x"/>
- <exec executable="sh">
- <arg line="install-tck-artifact.sh
${jaxrs.tck.version}"/>
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>tck-jax-rs</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- If you use proxy you need to set
it as a system properties -->
+ <get skipexisting="true"
+
src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/jakarta-restful-ws-tck-${jaxrs.tck.version}.zip";
+
dest="jakarta-restful-ws-tck-${jaxrs.tck.version}.zip"/>
+ <unzip
src="jakarta-restful-ws-tck-${jaxrs.tck.version}.zip" dest="./target"/>
+ <chmod file="install-tck-artifact.sh"
perm="+x"/>
+ <exec executable="sh">
+ <arg line="install-tck-artifact.sh
${jaxrs.tck.version}"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
