From b3a5fa25d22bbab9bc870c7c3d4e59f43c32fb02 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Thu, 24 Oct 2024 11:24:22 -0500
Subject: [PATCH] Fixes #4118 - Update Core Profile TCK to 11.0.0 (#4119)

---
 .github/workflows/tck-coreprofile.yml         |  9 +++++--
 external/coreprofile-tck/pom.xml              | 26 -------------------
 external/pom.xml                              |  1 -
 .../coreprofile/installer/pom.xml             |  8 +++---
 .../coreprofile/pom.xml                       | 10 ++++---
 .../coreprofile/runner/pom.xml                | 18 ++++++-------
 .../core/CustomJsonbSerializationITFix.java   |  0
 ...boss.arquillian.core.spi.LoadableExtension |  0
 .../runner/src/test/resources/arquillian.xml  |  0
 external/tck/inject/installer/pom.xml         |  2 +-
 external/tck/inject/pom.xml                   |  2 +-
 external/tck/inject/runner/pom.xml            |  2 +-
 external/tck/pom.xml                          |  2 ++
 13 files changed, 31 insertions(+), 49 deletions(-)
 delete mode 100644 external/coreprofile-tck/pom.xml
 rename external/{coreprofile-tck => tck}/coreprofile/installer/pom.xml (87%)
 rename external/{coreprofile-tck => tck}/coreprofile/pom.xml (67%)
 rename external/{coreprofile-tck => tck}/coreprofile/runner/pom.xml (85%)
 rename external/{coreprofile-tck => tck}/coreprofile/runner/src/test/java/cloud/piranha/tck/core/CustomJsonbSerializationITFix.java (100%)
 rename external/{coreprofile-tck => tck}/coreprofile/runner/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (100%)
 rename external/{coreprofile-tck => tck}/coreprofile/runner/src/test/resources/arquillian.xml (100%)

diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
index f76013d3a5..83a0461479 100644
--- a/.github/workflows/tck-coreprofile.yml
+++ b/.github/workflows/tck-coreprofile.yml
@@ -77,8 +77,8 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/coreprofile-tck/coreprofile
-        mvn -B -ntp verify        
+        cd external/tck/coreprofile
+        mvn -B -Dmaven.test.failure.ignore=true -ntp verify        
     - name: Test Summary
       uses: test-summary/action@v2
       with:
@@ -189,4 +189,9 @@ jobs:
       uses: test-summary/action@v2
       with:
         paths: "external/tck/rest/runner/target/failsafe-reports/**/TEST-*.xml"
+        output: test-summary.md
+      if: always()
+    - name: Job Summary
+      run: |
+        echo "${{ steps.test_summary.outputs.passed }} out of ${{ steps.test_summary.outputs.total }} tests passed" >> $GITHUB_STEP_SUMMARY
       if: always()
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
deleted file mode 100644
index 7b0f7f4b43..0000000000
--- a/external/coreprofile-tck/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>cloud.piranha.external.coreprofiletck</groupId>
-    <artifactId>project</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha Core Profile - Core Profile TCK project</name>
-
-    <modules>
-        <module>coreprofile</module>
-    </modules>
-
-    <properties>
-        <!-- TCK versions -->
-        <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
-    </properties>
-</project>
diff --git a/external/pom.xml b/external/pom.xml
index be775447f2..1b26f661c1 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -28,7 +28,6 @@
     </dependencyManagement>
 
     <modules>
-        <module>coreprofile-tck</module>
         <module>ejblite</module>
         <module>jakartaee-samples</module>
         <module>kickoff</module>
diff --git a/external/coreprofile-tck/coreprofile/installer/pom.xml b/external/tck/coreprofile/installer/pom.xml
similarity index 87%
rename from external/coreprofile-tck/coreprofile/installer/pom.xml
rename to external/tck/coreprofile/installer/pom.xml
index 499d90d0ab..574bd1c0a6 100644
--- a/external/coreprofile-tck/coreprofile/installer/pom.xml
+++ b/external/tck/coreprofile/installer/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck.coreprofile</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>installer</artifactId>
+    <artifactId>piranha-external-tck-coreprofile-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - Core Profile TCK - Installer</name>
+    <name>Piranha - External - TCK - Core Profile - Installer</name>
 
     <properties>
         <tck.home>${project.build.directory}/tck</tck.home>
@@ -33,7 +33,7 @@
                         <configuration>
                             <target>
                                 <!-- Download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/coreprofile/10.0/jakarta-core-profile-tck-${coreprofile.tck.version}.zip"
+                                <get src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-core-profile-tck-${coreprofile.tck.version}.zip"
                                      dest="${project.build.directory}/tck.zip"
                                      skipexisting="true"/>
                                 <unzip src="${project.build.directory}/tck.zip"
diff --git a/external/coreprofile-tck/coreprofile/pom.xml b/external/tck/coreprofile/pom.xml
similarity index 67%
rename from external/coreprofile-tck/coreprofile/pom.xml
rename to external/tck/coreprofile/pom.xml
index decb3bb204..c1725683a0 100644
--- a/external/coreprofile-tck/coreprofile/pom.xml
+++ b/external/tck/coreprofile/pom.xml
@@ -4,16 +4,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+    <groupId>cloud.piranha.external.tck.coreprofile</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - Core Profile TCK - Project</name>
+    <name>Piranha - External - TCK - Core Profile - Project</name>
+
+    <properties>
+        <coreprofile.tck.version>11.0.0</coreprofile.tck.version>
+    </properties>
 
     <modules>
         <module>installer</module>
diff --git a/external/coreprofile-tck/coreprofile/runner/pom.xml b/external/tck/coreprofile/runner/pom.xml
similarity index 85%
rename from external/coreprofile-tck/coreprofile/runner/pom.xml
rename to external/tck/coreprofile/runner/pom.xml
index fc433933ed..6e639fbe63 100644
--- a/external/coreprofile-tck/coreprofile/runner/pom.xml
+++ b/external/tck/coreprofile/runner/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck.coreprofile</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>runner</artifactId>
+    <artifactId>piranha-external-tck-coreprofile-runner</artifactId>
     <packaging>jar</packaging>
 
-    <name>Piranha Core Profile - Core Profile TCK - Runner</name>
+    <name>Piranha - External - TCK - Core Profile - Runner</name>
 
     <properties>
         <piranha.version>${project.version}</piranha.version>
@@ -30,20 +30,18 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- Run the installer first. Matters when executing in parallel  -->
         <dependency>
-            <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
-            <artifactId>installer</artifactId>
+            <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+            <artifactId>piranha-external-tck-coreprofile-installer</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
-            <scope>provided</scope>
         </dependency>
 
         <!-- The actual TCK jar containing the tests -->
         <dependency>
-            <groupId>jakarta.ee.tck.coreprofile</groupId>
+            <groupId>jakarta.tck.coreprofile</groupId>
             <artifactId>core-profile-tck-impl</artifactId>
-            <version>10.0.3</version>
+            <version>${coreprofile.tck.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -107,7 +105,7 @@
                 </executions>
                 <configuration>
                     <dependenciesToScan>
-                        <dependency>jakarta.ee.tck.coreprofile:core-profile-tck-impl</dependency>
+                        <dependency>jakarta.tck.coreprofile:core-profile-tck-impl</dependency>
                     </dependenciesToScan>
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
diff --git a/external/coreprofile-tck/coreprofile/runner/src/test/java/cloud/piranha/tck/core/CustomJsonbSerializationITFix.java b/external/tck/coreprofile/runner/src/test/java/cloud/piranha/tck/core/CustomJsonbSerializationITFix.java
similarity index 100%
rename from external/coreprofile-tck/coreprofile/runner/src/test/java/cloud/piranha/tck/core/CustomJsonbSerializationITFix.java
rename to external/tck/coreprofile/runner/src/test/java/cloud/piranha/tck/core/CustomJsonbSerializationITFix.java
diff --git a/external/coreprofile-tck/coreprofile/runner/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/external/tck/coreprofile/runner/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from external/coreprofile-tck/coreprofile/runner/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to external/tck/coreprofile/runner/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/external/coreprofile-tck/coreprofile/runner/src/test/resources/arquillian.xml b/external/tck/coreprofile/runner/src/test/resources/arquillian.xml
similarity index 100%
rename from external/coreprofile-tck/coreprofile/runner/src/test/resources/arquillian.xml
rename to external/tck/coreprofile/runner/src/test/resources/arquillian.xml
diff --git a/external/tck/inject/installer/pom.xml b/external/tck/inject/installer/pom.xml
index dba6834cdc..ced8feec22 100644
--- a/external/tck/inject/installer/pom.xml
+++ b/external/tck/inject/installer/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>piranha-external-tck-inject-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - Inject TCK - Installer</name>
+    <name>Piranha - External - TCK - Inject - Installer</name>
 
     <properties>
         <tck.home>${project.build.directory}/tck</tck.home>
diff --git a/external/tck/inject/pom.xml b/external/tck/inject/pom.xml
index 255e9821a0..6114b10ba3 100644
--- a/external/tck/inject/pom.xml
+++ b/external/tck/inject/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - Inject TCK - Project</name>
+    <name>Piranha - External - TCK - Inject - Project</name>
 
     <properties>
         <inject.tck.version>2.0.2</inject.tck.version>
diff --git a/external/tck/inject/runner/pom.xml b/external/tck/inject/runner/pom.xml
index 4647e940d7..2c6bc7608d 100644
--- a/external/tck/inject/runner/pom.xml
+++ b/external/tck/inject/runner/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>piranha-external-tck-inject-runner</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - Inject TCK - Runner</name>
+    <name>Piranha - External - TCK - Inject - Runner</name>
 
     <properties>
         <tck.home>${project.build.directory}/../../installer/target/tck</tck.home>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index c493836fbd..0e4a24bf52 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -18,11 +18,13 @@
     <modules>
         <module>annotations</module>
         <module>cdi</module>
+        <module>coreprofile</module>
         <module>el</module>
         <module>inject</module>
         <module>jsonb</module>
         <module>jsonp</module>
         <module>jwt</module>
+        <module>rest</module>
         <module>server</module>
         <module>wasp</module>
     </modules>