Fixes #3660 - Fix tck-server GitHub workflow (#3661)

piranhacloud · Feb 12, 2024 · 54a249a · 54a249a
1 parent 27310de
commit 54a249a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/extension/eclipse-expressly/pom.xml b/extension/eclipse-expressly/pom.xml
@@ -2,30 +2,28 @@
 
 <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.extension</groupId>
         <artifactId>project</artifactId>
         <version>24.3.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-extension-eclipse-expressly</artifactId>
     <packaging>jar</packaging>
-
     <name>Piranha - Extension - Eclipse Expressly</name>
-
+    <properties>
+        <expressly.version>5.0.0</expressly.version>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>cloud.piranha.core</groupId>
             <artifactId>piranha-core-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!-- see https://github.com/eclipse-ee4j/expressly -->
         <dependency>
             <groupId>org.glassfish.expressly</groupId>
             <artifactId>expressly</artifactId>
-            <version>5.0.0</version>
+            <version>${expressly.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/external/tck/el/pom.xml b/external/tck/el/pom.xml
@@ -2,18 +2,22 @@
 
 <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.3.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-external-tck-expression-language</artifactId>
     <packaging>pom</packaging>
-
     <name>Piranha - External - 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>
@@ -147,12 +151,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <ant.home>${project.build.directory}/ant</ant.home>
-        <ant.java.home>${java.home}</ant.java.home>
-        <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>
 </project>
diff --git a/external/tck/wasp/pom.xml b/external/tck/wasp/pom.xml
@@ -2,18 +2,23 @@
 
 <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.3.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-external-tck-wasp</artifactId>
     <packaging>pom</packaging>
-
     <name>Piranha - External - TCK - WaSP</name>
-
+    <properties>
+        <ant.home>${project.build.directory}/ant</ant.home>
+        <expressly.version>5.0.0</expressly.version>
+        <piranha.home>${project.build.directory}/piranha</piranha.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>
+        <wasp.version>3.2.0</wasp.version>
+    </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -241,12 +246,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <ant.home>${project.build.directory}/ant</ant.home>
-        <piranha.home>${project.build.directory}/piranha</piranha.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>
 </project>