From e3dd5c47e172d6a633fdde1c83efff33f3838df6 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Thu, 24 Oct 2024 07:31:23 -0500
Subject: [PATCH] Fixes #4111 - Update JSON Processing TCK (#4112)

---
 .github/workflows/tck-coreprofile.yml         |  6 +-
 external/coreprofile-tck/pom.xml              |  4 -
 .../jsonp => tck/jsonp/installer}/pom.xml     | 35 +--------
 external/tck/jsonp/pom.xml                    | 39 ++++++++++
 external/tck/jsonp/runner/pom.xml             | 74 +++++++++++++++++++
 external/tck/pom.xml                          |  1 +
 6 files changed, 120 insertions(+), 39 deletions(-)
 rename external/{coreprofile-tck/jsonp => tck/jsonp/installer}/pom.xml (69%)
 create mode 100644 external/tck/jsonp/pom.xml
 create mode 100644 external/tck/jsonp/runner/pom.xml

diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
index 265195fc9..2d26bf5a1 100644
--- a/.github/workflows/tck-coreprofile.yml
+++ b/.github/workflows/tck-coreprofile.yml
@@ -153,14 +153,14 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/coreprofile-tck/jsonp
+        cd external/tck/jsonp
         mvn -B -ntp verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
         paths: |
-          external/coreprofile-tck/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
-          external/coreprofile-tck/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
+          external/tck/jsonb/installer/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
+          external/tck/jsonb/installer/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
       if: always()
   rest:
     if: github.repository == 'piranhacloud/piranha'
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
index 863d61edf..126de66b2 100644
--- a/external/coreprofile-tck/pom.xml
+++ b/external/coreprofile-tck/pom.xml
@@ -18,7 +18,6 @@
     <modules>
         <module>cdi</module>
         <module>coreprofile</module>
-        <module>jsonp</module>
         <module>rest</module>
     </modules>
 
@@ -26,11 +25,8 @@
         <!-- TCK versions -->
         <cdi.tck.version>4.0.13</cdi.tck.version>
         <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
-        <jsonp.tck.version>2.1.1</jsonp.tck.version>
         <rest.tck.version>3.1.5</rest.tck.version>
         <!-- Implementation versions -->
-        <parsson.version>1.1.7</parsson.version>
         <weld.version>6.0.0.Beta4</weld.version>
-        <yasson.version>3.0.4</yasson.version>
     </properties>
 </project>
diff --git a/external/coreprofile-tck/jsonp/pom.xml b/external/tck/jsonp/installer/pom.xml
similarity index 69%
rename from external/coreprofile-tck/jsonp/pom.xml
rename to external/tck/jsonp/installer/pom.xml
index 5ea804c51..3c71fddba 100644
--- a/external/coreprofile-tck/jsonp/pom.xml
+++ b/external/tck/jsonp/installer/pom.xml
@@ -4,32 +4,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck.jsonp</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jsonp-tck</artifactId>
+    <artifactId>piranha-external-tck-jsonp-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - JSON Processing TCK</name>
+    <name>Piranha - External - TCK - JSON Processing - Installer</name>
 
     <properties>
         <tck.home>${project.build.directory}/tck</tck.home>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>cloud.piranha</groupId>
-                <artifactId>bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -71,23 +59,6 @@
                             </target>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Run the tests -->
-                                <exec dir="${tck.home}/bin"
-                                      executable="mvn"
-                                      failonerror="true">
-                                    <arg value="verify"/>
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/external/tck/jsonp/pom.xml b/external/tck/jsonp/pom.xml
new file mode 100644
index 000000000..c6e4e00ff
--- /dev/null
+++ b/external/tck/jsonp/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.jsonp</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - JSON Processing - Project</name>
+
+    <properties>
+        <jsonp.tck.version>2.1.1</jsonp.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>
diff --git a/external/tck/jsonp/runner/pom.xml b/external/tck/jsonp/runner/pom.xml
new file mode 100644
index 000000000..0205d0fe0
--- /dev/null
+++ b/external/tck/jsonp/runner/pom.xml
@@ -0,0 +1,74 @@
+<?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.jsonp</groupId>
+        <artifactId>project</artifactId>
+        <version>24.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>cloud-piranha-external-tck-jsonp-runner</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - JSON Processing - Runner</name>
+
+    <properties>
+        <tck.home>${project.build.directory}/../../installer/target/tck</tck.home>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>cloud.piranha.external.tck.jsonp</groupId>
+            <artifactId>piranha-external-tck-jsonp-installer</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <!-- Run the tests -->
+                                <echo>----------------------------------------------------------</echo>
+                                <echo>Running JSON Processing TCK ${jsonp.tck.version} against Parsson ${parsson.version}</echo>
+                                <echo>----------------------------------------------------------</echo>
+                                <exec dir="${tck.home}/bin"
+                                      executable="mvn"
+                                      failonerror="true">
+                                    <arg value="verify"/>
+                                </exec>
+                                <echo>----------------------------------------------------------</echo>
+                                <echo>Ran JSON Processing TCK ${jsonp.tck.version} against Parsson ${parsson.version}</echo>
+                                <echo>----------------------------------------------------------</echo>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index bf49dc488..fcd3b3b42 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -20,6 +20,7 @@
         <module>el</module>
         <module>inject</module>
         <module>jsonb</module>
+        <module>jsonp</module>
         <module>jwt</module>
         <module>server</module>
         <module>wasp</module>