Fixes #4115 - Update REST TCK to 4.0.1 (#4116)

.github/workflows/tck-coreprofile.yml

@@ -55,7 +55,7 @@ jobs:
       uses: test-summary/action@v2
       with:
         paths: |
-          external/tck/cdi/runner/core/target/surefire-reports/junit-reports/TEST-*.xml
+          external/tck/cdi/runner/core/target/surefire-reports/junitreports/TEST-*.xml
           external/tck/cdi/runner/model/target/surefire-reports/TEST-*.xml
       if: always()
   coreprofile:
@@ -184,7 +184,7 @@ jobs:
     - name: Run TCK
       run: |
         cd external/coreprofile-tck/rest
-        mvn -B -ntp verify        
+        mvn -B -ntp -T 1 verify        
     - name: Test Summary
       uses: test-summary/action@v2
       with:

external/coreprofile-tck/pom.xml

@@ -17,12 +17,10 @@
 
     <modules>
         <module>coreprofile</module>
-        <module>rest</module>
     </modules>
 
     <properties>
         <!-- TCK versions -->
         <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
-        <rest.tck.version>3.1.5</rest.tck.version>
     </properties>
 </project>

external/coreprofile-tck/rest/pom.xml → external/tck/rest/installer/pom.xml

@@ -4,21 +4,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck.rest</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>rest-tck</artifactId>
+    <artifactId>piranha-external-tck-rest-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - REST TCK</name>
+    <name>Piranha - External - TCK - REST - Installer</name>
 
     <properties>
-        <ant.home>${project.build.directory}/ant</ant.home>
-        <signature.home>${project.build.directory}/signature</signature.home>
         <tck.home>${project.build.directory}/tck</tck.home>
-        <test.home>${tck.home}/src/com/sun/ts/tests</test.home>
     </properties>
 
     <dependencyManagement>
@@ -48,7 +45,7 @@
                         <configuration>
                             <target>
                                 <!-- Download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/restful-ws/3.1/jakarta-restful-ws-tck-${rest.tck.version}.zip"
+                                <get src="https://download.eclipse.org/jakartaee/restful-ws/4.0/jakarta-restful-ws-tck-${rest.tck.version}.zip"
                                      dest="${project.build.directory}/tck.zip"
                                      skipexisting="true"/>
                                 <unzip src="${project.build.directory}/tck.zip"
@@ -62,36 +59,8 @@
                             </target>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Run the tests -->
-                                <exec dir="${project.build.directory}/../runner"
-                                      executable="mvn"
-                                      failonerror="true">
-                                    <arg value="verify"/>
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${basedir}/runner/target</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

external/tck/rest/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cloud.piranha.external.tck</groupId>
+        <artifactId>project</artifactId>
+        <version>24.11.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>cloud.piranha.external.tck.rest</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - REST - Project</name>
+
+    <properties>
+        <rest.tck.version>4.0.1</rest.tck.version>
+    </properties>
+
+    <modules>
+        <module>installer</module>
+        <module>runner</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>

external/coreprofile-tck/rest/runner/pom.xml → external/tck/rest/runner/pom.xml

@@ -3,14 +3,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck.rest</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>rest-tck-runner</artifactId>
+
+    <artifactId>piranha-external-tck-rest-runner</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha Core Profile - REST TCK - Runner</name>
+    <name>Piranha - External - TCK - REST - Runner</name>
+
     <properties>
         <piranha.version>${project.version}</piranha.version>
     </properties>
@@ -36,7 +37,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta-restful-ws-tck</artifactId>
-            <version>3.1.5</version>
+            <version>${rest.tck.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>