From 58d656df8e49d4a952b6471e5088a20ef592f262 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Wed, 1 Jan 2025 16:16:12 -0600
Subject: [PATCH] Fixes #4459 - Move Expression TCK to Piranha Servlet TCK
 project (#4460)

---
 external/servlet-tck/expression/pom.xml | 157 ------------------------
 external/servlet-tck/pom.xml            |   1 -
 2 files changed, 158 deletions(-)
 delete mode 100644 external/servlet-tck/expression/pom.xml

diff --git a/external/servlet-tck/expression/pom.xml b/external/servlet-tck/expression/pom.xml
deleted file mode 100644
index 6859a5aa7..000000000
--- a/external/servlet-tck/expression/pom.xml
+++ /dev/null
@@ -1,157 +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.servlettck</groupId>
-        <artifactId>project</artifactId>
-        <version>25.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>piranha-external-servlettck-expression-language</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Piranha - External - Servlet TCK - Expression Language</name>
-    <properties>
-        <ant.home>${project.build.directory}/ant</ant.home>
-        <ant.java.home>${java.home}</ant.java.home>
-        <expressly.version>5.0.0</expressly.version>
-        <work.home>${project.build.directory}/work</work.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>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                        <configuration>
-                            <target>
-                                <!-- download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/expression-language/5.0/jakarta-expression-language-tck-5.0.0.zip"
-                                     dest="${project.build.directory}/tck.zip"
-                                     skipexisting="true"
-                                     verbose="true"/>
-                                <unzip src="${project.build.directory}/tck.zip"
-                                       dest="${project.build.directory}"/>
-                                <move file="${project.build.directory}/expression-language-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"
-                                     verbose="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="*"/>
-                                
-                                <!-- keep copy of original ts.jte -->
-                                <copy file="${tck.home}/bin/ts.jte"
-                                      tofile="${tck.home}/bin/ts.jte.orig"/> 
-                                
-                                <!-- setup ts.jte for signature tests -->
-                                <replaceregexp file="${tck.home}/bin/ts.jte"
-                                               match="el\.classes=(.*)"
-                                               replace="el.classes=${work.home}/jars/expressly.jar${pathsep}${work.home}/jars/jakarta.el-api.jar"
-                                               byline="true"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- run the signature tests -->
-                                <exec executable="${ant.home}/bin/ant"
-                                      dir="${tck.home}/src/com/sun/ts/tests/signaturetest">
-                                    <arg value="-Dwork.dir=${signature.home}/work"/>
-                                    <arg value="-Dreport.dir=${signature.home}/report"/>
-                                    <arg value="runclient"/>
-                                    <env key="JAVA_HOME" value="${ant.java.home}" />
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- run all the tests -->
-                                <exec executable="${ant.home}/bin/ant" 
-                                      dir="${test.home}">
-                                    <arg value="-Dwork.dir=${work.home}/work"/>
-                                    <arg value="-Dreport.dir=${work.home}/report"/>
-                                    <arg value="runclient"/>
-                                    <env key="JAVA_HOME" value="${ant.java.home}" />
-                                </exec>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.glassfish.expressly</groupId>
-                                    <artifactId>expressly</artifactId>
-                                    <version>6.0.0-M1</version>
-                                    <outputDirectory>${work.home}/jars</outputDirectory>
-                                    <destFileName>expressly.jar</destFileName>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.el</groupId>
-                                    <artifactId>jakarta.el-api</artifactId>
-                                    <version>6.0.0-M2</version>
-                                    <outputDirectory>${work.home}/jars</outputDirectory>
-                                    <destFileName>jakarta.el-api.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/external/servlet-tck/pom.xml b/external/servlet-tck/pom.xml
index bdc805b21..a25733eef 100644
--- a/external/servlet-tck/pom.xml
+++ b/external/servlet-tck/pom.xml
@@ -16,7 +16,6 @@
     <packaging>pom</packaging>
     <name>Piranha - External - Servlet TCK - Project</name>
     <modules>
-        <module>expression</module>
         <module>pages</module>
     </modules>
 </project>