From 4bac7c4f08cd453351103716b1140b7dc36a433b Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Mon, 23 Dec 2024 08:48:03 -0600
Subject: [PATCH] Fixes #4420 - Move webprofile module in external/tck to
 webprofile-tck module

---
 .../annotations-tck/installer/pom.xml         |  61 ----------
 .../tck/webprofile/annotations-tck/pom.xml    |  49 ---------
 .../webprofile/annotations-tck/runner/pom.xml | 104 ------------------
 external/tck/webprofile/pom.xml               |  21 ----
 4 files changed, 235 deletions(-)
 delete mode 100644 external/tck/webprofile/annotations-tck/installer/pom.xml
 delete mode 100644 external/tck/webprofile/annotations-tck/pom.xml
 delete mode 100644 external/tck/webprofile/annotations-tck/runner/pom.xml
 delete mode 100644 external/tck/webprofile/pom.xml

diff --git a/external/tck/webprofile/annotations-tck/installer/pom.xml b/external/tck/webprofile/annotations-tck/installer/pom.xml
deleted file mode 100644
index 3ebd3a830..000000000
--- a/external/tck/webprofile/annotations-tck/installer/pom.xml
+++ /dev/null
@@ -1,61 +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.tck.webprofile.annotationstck</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>piranha-external-tck-webprofile-annotationstck-installer</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha - External - TCK - Piranha Web Profile - Annotations TCK - 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/webprofile/annotations-tck/pom.xml b/external/tck/webprofile/annotations-tck/pom.xml
deleted file mode 100644
index 3f0df8644..000000000
--- a/external/tck/webprofile/annotations-tck/pom.xml
+++ /dev/null
@@ -1,49 +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.tck.webprofile</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>cloud.piranha.external.tck.webprofile.annotationstck</groupId>
-    <artifactId>project</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha - External - TCK - Piranha Web Profile - Annotations TCK - 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/webprofile/annotations-tck/runner/pom.xml b/external/tck/webprofile/annotations-tck/runner/pom.xml
deleted file mode 100644
index cbe6977cd..000000000
--- a/external/tck/webprofile/annotations-tck/runner/pom.xml
+++ /dev/null
@@ -1,104 +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.tck.webprofile.annotationstck</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>piranha-external-tck-webprofile-annotationstck-runner</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha - External - TCK - Piranha Web Profile - Annotations TCK - Runner</name>
-
-    <properties>
-        <jimage.dir>${project.build.directory}/jimage</jimage.dir>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>cloud.piranha.external.tck.webprofile.annotationstck</groupId>
-            <artifactId>piranha-external-tck-webprofile-annotationstck-installer</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-        <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/webprofile/pom.xml b/external/tck/webprofile/pom.xml
deleted file mode 100644
index 9a3b14c29..000000000
--- a/external/tck/webprofile/pom.xml
+++ /dev/null
@@ -1,21 +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 http://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.webprofile</groupId>
-    <artifactId>project</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha - External - TCK - Piranha Web Profile - Project</name>
-
-    <modules>
-        <module>annotations-tck</module>
-    </modules>
-</project>