From 9d0d964f7a3ff5207cb58126dbc5c70a63f8300a Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Wed, 23 Oct 2024 17:06:08 -0500
Subject: [PATCH] Fixes #4098 - Update Jakarta Annotations TCK to 3.0.0 (#4099)

---
 .github/workflows/tck-coreprofile.yml        |  20 +--
 external/coreprofile-tck/annotations/pom.xml | 124 -------------------
 external/coreprofile-tck/pom.xml             |   2 -
 external/tck/annotations/installer/pom.xml   |  61 +++++++++
 external/tck/annotations/pom.xml             |  49 ++++++++
 external/tck/annotations/runner/pom.xml      |  98 +++++++++++++++
 external/tck/pom.xml                         |   1 +
 7 files changed, 215 insertions(+), 140 deletions(-)
 delete mode 100644 external/coreprofile-tck/annotations/pom.xml
 create mode 100644 external/tck/annotations/installer/pom.xml
 create mode 100644 external/tck/annotations/pom.xml
 create mode 100644 external/tck/annotations/runner/pom.xml

diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
index 380b81ac0..30c39ab01 100644
--- a/.github/workflows/tck-coreprofile.yml
+++ b/.github/workflows/tck-coreprofile.yml
@@ -1,17 +1,5 @@
 name: tck-coreprofile
 on: 
-  push:
-    paths:
-      - 'external/coreprofile-tck/**'
-    branches:
-      - '*'
-    tags-ignore:
-      - 'v*'
-  pull_request:
-    paths:
-      - 'external/coreprofile-tck/**'
-    branches:
-      - '*'  
   schedule:
   - cron: "0 0 * * *"
   workflow_dispatch:
@@ -35,9 +23,13 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/coreprofile-tck/annotations
+        cd external/tck/annotations
         mvn -B -ntp verify
-        cat target/tck/report/text/summary.txt >> $GITHUB_STEP_SUMMARY
+    - name: Test Summary
+      uses: test-summary/action@v2
+      with:
+        paths: "external/tck/annotations/runner/target/failsafe-reports/*IT.xml"
+      if: always()
   atinject:
     if: github.repository == 'piranhacloud/piranha'
     runs-on: ${{ matrix.os }}
diff --git a/external/coreprofile-tck/annotations/pom.xml b/external/coreprofile-tck/annotations/pom.xml
deleted file mode 100644
index 52d147d66..000000000
--- a/external/coreprofile-tck/annotations/pom.xml
+++ /dev/null
@@ -1,124 +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.coreprofiletck</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>annotations-tck</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha Core Profile - Annotations TCK</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>
-        <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>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/annotations/2.1/jakarta-annotations-tck-${annotations.tck.version}.zip"
-                                             dest="${project.build.directory}/tck.zip"
-                                             skipexisting="true"/>
-                                <unzip src="${project.build.directory}/tck.zip"
-                                               dest="${project.build.directory}"/>
-                                <move file="${project.build.directory}/annotations-tck"
-                                              tofile="${project.build.directory}/tck"/>
-                                        
-                                <!-- Download, unzip, rename and chmod Ant 1.10.9 -->
-                                <get src="https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip"
-                                             dest="${project.build.directory}/ant.zip" skipexisting="true"/>
-                                <unzip src="${project.build.directory}/ant.zip"
-                                               dest="${project.build.directory}"/>
-                                <move file="${project.build.directory}/apache-ant-1.10.9"
-                                              tofile="${project.build.directory}/ant"/>
-                                <chmod dir="${ant.home}/bin"
-                                               perm="ugo+rx"
-                                               includes="*"/>
-                                        
-                                <!-- Setup ts.jte for signature tests -->
-                                <replaceregexp file="${tck.home}/bin/ts.jte"
-                                                       match="local\.classes=(.*)"
-                                                       replace="local\.classes=${signature.home}/jakarta.annotation-api.jar"
-                                                       byline="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Run all the tests -->
-                                <exec dir="${test.home}"
-                                      executable="${ant.home}/bin/ant" 
-                                      failonerror="true">
-                                    <arg value="-Dwork.dir=${tck.home}/work"/>
-                                    <arg value="-Dreport.dir=${tck.home}/report"/>
-                                    <arg value="runclient"/>
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>jakarta.annotation</groupId>
-                                    <artifactId>jakarta.annotation-api</artifactId>
-                                    <outputDirectory>${signature.home}</outputDirectory>
-                                    <destFileName>jakarta.annotation-api.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
index 7cb40a321..b0186466a 100644
--- a/external/coreprofile-tck/pom.xml
+++ b/external/coreprofile-tck/pom.xml
@@ -16,7 +16,6 @@
     <name>Piranha Core Profile - Core Profile TCK project</name>
 
     <modules>
-        <module>annotations</module>
         <module>atinject</module>
         <module>cdi</module>
         <module>coreprofile</module>
@@ -27,7 +26,6 @@
 
     <properties>
         <!-- TCK versions -->
-        <annotations.tck.version>2.1.1</annotations.tck.version>
         <cdi.tck.version>4.0.13</cdi.tck.version>
         <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
         <inject.tck.version>2.0.2</inject.tck.version>
diff --git a/external/tck/annotations/installer/pom.xml b/external/tck/annotations/installer/pom.xml
new file mode 100644
index 000000000..b53fb283c
--- /dev/null
+++ b/external/tck/annotations/installer/pom.xml
@@ -0,0 +1,61 @@
+<?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.annotations</groupId>
+        <artifactId>project</artifactId>
+        <version>24.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>piranha-external-tck-annotations-installer</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - Annotations - Installer</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <!-- Download, unzip and rename TCK -->
+                                <get src="https://download.eclipse.org/jakartaee/annotations/3.0/jakarta-annotations-tck-${annotations.tck.version}.zip"
+                                     dest="${project.build.directory}/tck.zip"
+                                     skipexisting="true"/>
+                                <unzip src="${project.build.directory}/tck.zip"
+                                       dest="${project.build.directory}"/>
+                                <move file="${project.build.directory}/annotations-tck"
+                                      tofile="${project.build.directory}/tck"/>
+                                
+                                <!-- Install the TCK artifacts into local Maven repository -->
+                                <chmod dir="${project.build.directory}/tck/artifacts"
+                                       perm="ugo+rx"
+                                       includes="*"/>
+                                <exec dir="${project.build.directory}/tck/artifacts"
+                                      executable="./artifact-install.sh"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <!-- skipping here as the runner project runs the actual tests -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/external/tck/annotations/pom.xml b/external/tck/annotations/pom.xml
new file mode 100644
index 000000000..a4270b19c
--- /dev/null
+++ b/external/tck/annotations/pom.xml
@@ -0,0 +1,49 @@
+<?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.annotations</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - Annotations - Project</name>
+
+    <properties>
+        <annotations.tck.version>3.0.0</annotations.tck.version>
+        <sigtest-maven-plugin.version>2.2</sigtest-maven-plugin.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>
+            <dependency>
+                <groupId>jakarta.tck</groupId>
+                <artifactId>sigtest-maven-plugin</artifactId>
+                <version>${sigtest-maven-plugin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta-annotations-tck</artifactId>
+                <version>${annotations.tck.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/external/tck/annotations/runner/pom.xml b/external/tck/annotations/runner/pom.xml
new file mode 100644
index 000000000..adbffe5e8
--- /dev/null
+++ b/external/tck/annotations/runner/pom.xml
@@ -0,0 +1,98 @@
+<?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.annotations</groupId>
+        <artifactId>project</artifactId>
+        <version>24.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>piranha-external-tck-annotations-runner</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha - External - TCK - Annotations - Runner</name>
+
+    <properties>
+        <jimage.dir>${project.build.directory}/jimage</jimage.dir>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta-annotations-tck</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <!-- version comes from the BOM import in parent project -->
+                                    <groupId>jakarta.annotation</groupId>
+                                    <artifactId>jakarta.annotation-api</artifactId>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>jakarta.annotation-api.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>sig-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <dependenciesToScan>jakarta.annotation:jakarta-annotations-tck</dependenciesToScan>
+                            <systemPropertyVariables>
+                                <jimage.dir>${jimage.dir}</jimage.dir>
+                                <sigTestClasspath>${project.build.directory}/jakarta.annotation-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming</sigTestClasspath>
+                                <ca.sig.generated>true</ca.sig.generated>
+                                <ca.sig.postconstruct>true</ca.sig.postconstruct>
+                                <ca.sig.priority>true</ca.sig.priority>
+                                <ca.sig.predestroy>true</ca.sig.predestroy>
+                                <ca.sig.resource>true</ca.sig.resource>
+                                <ca.sig.resources>true</ca.sig.resources>
+                                <ca.sig.securitydeclareroles>true</ca.sig.securitydeclareroles>
+                                <ca.sig.securitydenyall>true</ca.sig.securitydenyall>
+                                <ca.sig.securitypermitall>true</ca.sig.securitypermitall>
+                                <ca.sig.securityrolesallowed>true</ca.sig.securityrolesallowed>
+                                <ca.sig.securityrunas>true</ca.sig.securityrunas>
+                                <ca.sig.sqldatasourcedefinition>true</ca.sig.sqldatasourcedefinition>
+                                <ca.sig.sqldatasourcedefinitions>true</ca.sig.sqldatasourcedefinitions>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index 665b24ad2..ba9432e9d 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -16,6 +16,7 @@
     <name>Piranha - External - TCK - Project</name>
 
     <modules>
+        <module>annotations</module>
         <module>el</module>
         <module>jwt</module>
         <module>server</module>