Merge pull request #23888 from arjantijms/external_tck_update
Add external pages TCK and start update to EE 10
diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml
index c387f87..871a496 100644
--- a/appserver/tests/tck/authentication/pom.xml
+++ b/appserver/tests/tck/authentication/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>glassfish-external-tck-authentication</artifactId>
@@ -38,7 +38,7 @@
<tck.home>${project.build.directory}/authentication-tck</tck.home>
<tck.tests.home>${tck.home}/src/com/sun/ts/tests/jsf</tck.tests.home>
- <glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
+ <glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
<glassfish.version>${project.version}</glassfish.version>
<glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>
@@ -174,8 +174,6 @@
<!-- Change configuration -->
- <copy file="${tck.home}/bin/ts.jte.jdk11" tofile="${tck.home}/bin/ts.jte" overwrite="true" />
-
<tck-setting key="jaspic.home" value="${glassfish.home}/glassfish"/>
<tck-setting key="harness.log.traceflag" value="true"/>
<tck-setting key="s1as.jvm.options" value="-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}"/>
diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml
index 53a2bbf..42b3cfe 100644
--- a/appserver/tests/tck/authorization/pom.xml
+++ b/appserver/tests/tck/authorization/pom.xml
@@ -154,7 +154,6 @@
classpathref="maven.plugin.classpath" />
<!-- Change configuration -->
- <copy file="${tck.home}/bin/ts.jte.jdk11" tofile="${tck.home}/bin/ts.jte" overwrite="true" />
<replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
match="s1as\.admin\.port=.*"
replace="s1as\.admin\.port=${port.admin}" />
diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml
index 39806a2..332564b 100644
--- a/appserver/tests/tck/faces/pom.xml
+++ b/appserver/tests/tck/faces/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>glassfish-external-tck-faces</artifactId>
diff --git a/appserver/tests/tck/pages/pom.xml b/appserver/tests/tck/pages/pom.xml
new file mode 100644
index 0000000..62c9a74
--- /dev/null
+++ b/appserver/tests/tck/pages/pom.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>glassfish-external-tck-pages</artifactId>
+ <packaging>pom</packaging>
+
+ <name>TCK: pages</name>
+
+ <properties>
+ <ant.home>${project.build.directory}/apache-ant-${ant.version}</ant.home>
+ <ant.zip.url>https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip</ant.zip.url>
+
+ <tck.home>${project.build.directory}/pages-tck</tck.home>
+ <tck.tests.home>${tck.home}/src/com/sun/ts/tests</tck.tests.home>
+
+ <glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
+ <glassfish.version>${project.version}</glassfish.version>
+ <glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>
+
+ <jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
+
+ <port.admin>14848</port.admin>
+ <port.derby>11527</port.derby>
+ <port.http>18080</port.http>
+ <port.https>18181</port.https>
+ <port.jms>17676</port.jms>
+ <port.jmx>18686</port.jmx>
+ <port.orb>13700</port.orb>
+ <port.orb.mutual>13920</port.orb.mutual>
+ <port.orb.ssl>13820</port.orb.ssl>
+ <port.harness.log>12000</port.harness.log>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>jakarta-pages-tck</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-ant</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${skipITs}</skip>
+ <url>${ant.zip.url}</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>unpack-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>glassfish</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jakarta-pages-tck</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>prepare-tck-and-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+
+ <macrodef name="tck-setting">
+ <attribute name="key" /> <attribute name="value" />
+ <sequential>
+ <replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
+ match="@{key}=.*" replace="@{key}=@{value}" />
+ </sequential>
+ </macrodef>
+
+
+ <!-- Change configuration -->
+
+ <tck-setting key="webServerHome" value="${glassfish.home}/glassfish"/>
+ <tck-setting key="webServerHost" value="localhost"/>
+ <tck-setting key="webServerPort" value="${port.http}"/>
+
+ <tck-setting key="securedWebServicePort" value="${port.https}"/>
+ <tck-setting key="s1as.admin.port" value="${port.admin}"/>
+ <tck-setting key="glassfish.admin.port" value="${port.admin}"/>
+ <tck-setting key="orb.port" value="${port.orb}"/>
+ <tck-setting key="database.port" value="${port.derby}"/>
+ <tck-setting key="harness.log.port" value="${port.harness.log}"/>
+
+ <tck-setting key="report.dir" value="${tck.home}/pagesreport/pages"/>
+ <tck-setting key="work.dir" value="${tck.home}/pageswork/pages"/>
+
+ <tck-setting key="impl.vi" value="glassfish"/>
+ <tck-setting key="impl.vi.deploy.dir" value="${webServerHome}/domains/domain1/autodeploy"/>
+ <tck-setting key="impl.deploy.timeout.multiplier" value="30"/>
+
+ <tck-setting key="jspservlet.classes" value="${webServerHome}/modules/jakarta.servlet-api.jar${pathsep}${webServerHome}/modules/wasp.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp-api.jar"/>
+ <tck-setting key="jstl.classes" value="${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar"/>
+ <tck-setting key="el.classes" value="${webServerHome}/modules/jakarta.el.jar${pathsep}${webServerHome}/modules/jakarta.el-api.jar"/>
+
+
+ <limit maxwait="60">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="delete-domain"/>
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-domain"/>
+ <arg value="--domainproperties=domain.adminPort=${port.admin}:domain.instancePort=${port.http}:http.ssl.port=${port.https}:jms.port=${port.jms}:domain.jmxPort=${port.jmx}:orb.listener.port=${port.orb}:orb.ssl.port=${port.orb.ssl}:orb.mutualauth.port=${port.orb.mutual}" />
+ <arg value="--user=admin" />
+ <arg value="--nopassword" />
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+
+ <if>
+ <isset property="jacoco.version" />
+ <then>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-jvm-options" />
+ <arg value="--port=${port.admin}" />
+ <arg value=""-javaagent\:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec,includes=${jacoco.includes}"" />
+ </exec>
+ </then>
+ </if>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain"/>
+ <arg value="domain1"/>
+ </exec>
+ </limit>
+ <mkdir dir="${tck.home}/pagestckreport"/>
+ <mkdir dir="${tck.home}/pagestckreport/pagestck"/>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml">
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
+ </replace>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>configure-tck-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+ <limit maxwait="20">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ <arg value="--suspend" if:set="glassfish.suspend"/>
+ </exec>
+ </limit>
+
+ <!-- Deploy single test -->
+ <sequential if:set="run.test" >
+ <dirname property="test.dir" file="${tck.home}/src/${run.test}"/>
+ <echo>Deploying from ${test.dir}</echo>
+
+ <exec executable="${ant.home}/bin/ant" dir="${test.dir}">
+ <arg value="deploy" />
+ </exec>
+ </sequential>
+
+ <!-- Deploy all tests -->
+ <sequential unless:set="run.test" >
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
+ <arg value="deploy.all" />
+ </exec>
+ </sequential>
+ </target>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>run-tck-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+
+ <echo level="info" message="Start running all tests" />
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
+ <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
+ <arg value="run.all" unless:set="run.test"/>
+ <arg value="runclient" if:set="run.test" />
+ <env key="LC_ALL" value="C" />
+ </exec>
+
+ <if>
+ <not>
+ <equals arg1="${testResult}" arg2="0" />
+ </not>
+ <then>
+ <echo message="Running tests failed." />
+ <loadfile property="contents" srcFile="${glassfish.home}/glassfish/domains/domain1/logs/server.log" />
+ <echo message="${contents}" />
+ </then>
+ </if>
+
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml
index 9952b2d..8286431 100644
--- a/appserver/tests/tck/rest/pom.xml
+++ b/appserver/tests/tck/rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>glassfish-external-tck-rest</artifactId>
diff --git a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
index 3de3af2..3d913ec 100644
--- a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck-download</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>jakarta-authentication-tck</artifactId>
@@ -32,7 +32,8 @@
<name>TCK: Install Jakarta Authentication TCK</name>
<properties>
- <tck.test.authentication.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-authentication-tck-2.0.1.zip</tck.test.authentication.url>
+ <tck.test.authentication.file>jakarta-authentication-tck-3.0.0.zip</tck.test.authentication.file>
+ <tck.test.authentication.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.authentication.file}</tck.test.authentication.url>
</properties>
<build>
@@ -65,7 +66,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/jakarta-authentication-tck-2.0.1.zip</file>
+ <file>${project.build.directory}/${tck.test.authentication.file}</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
index 4306e11..2ea96a3 100644
--- a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
@@ -31,7 +31,8 @@
<name>TCK: Install Jakarta Authorization TCK</name>
<properties>
- <tck.tests.authorization.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-authorization-tck-2.0.1.zip</tck.tests.authorization.url>
+ <tck.test.authorization.file>jakarta-authorization-tck-2.1.0.zip</tck.test.authorization.file>
+ <tck.tests.authorization.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.authorization.file}</tck.tests.authorization.url>
</properties>
<build>
@@ -64,7 +65,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/jakarta-authorization-tck-2.0.1.zip</file>
+ <file>${project.build.directory}/${tck.test.authorization.file}</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
index f59e677..c31edaf 100644
--- a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck-download</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>jakarta-faces-tck</artifactId>
@@ -32,7 +32,8 @@
<name>TCK: Install Jakarta Faces TCK</name>
<properties>
- <tck.test.faces.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-faces-tck-3.0.1.zip</tck.test.faces.url>
+ <tck.test.faces.file>jakarta-faces-tck-4.0.0.zip</tck.test.faces.file>
+ <tck.test.faces.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.faces.file}</tck.test.faces.url>
</properties>
<build>
@@ -65,7 +66,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/jakarta-faces-tck-3.0.1.zip</file>
+ <file>${project.build.directory}/${tck.test.faces.file}</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml
new file mode 100644
index 0000000..ada0bdc
--- /dev/null
+++ b/appserver/tests/tck/tck-download/jakarta-pages-tck/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<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>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck-download</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jakarta-pages-tck</artifactId>
+ <packaging>pom</packaging>
+ <name>TCK: Install Jakarta pages TCK</name>
+
+ <properties>
+ <tck.test.pages.file>jakarta-pages-tck-3.1.0.zip</tck.test.pages.file>
+ <tck.test.pages.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.pages.file}</tck.test.pages.url>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-pages-tck</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <url>${tck.test.pages.url}</url>
+ <unpack>false</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-pages-tck</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${tck.test.pages.file}</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>zip</packaging>
+ <generatePom>true</generatePom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
index 1318673..bdb593a 100644
--- a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main.tests.tck</groupId>
<artifactId>tck-download</artifactId>
- <version>6.2.4-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>jakarta-rest-tck</artifactId>
@@ -32,7 +32,8 @@
<name>TCK: Install Jakarta REST TCK</name>
<properties>
- <tck.test.rest.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-restful-ws-tck-3.0.2.zip</tck.test.rest.url>
+ <tck.test.rest.file>jakarta-pages-tck-3.1.0.zip</tck.test.rest.file>
+ <tck.test.rest.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.rest.file}</tck.test.rest.url>
</properties>
<build>
@@ -65,7 +66,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <file>${project.build.directory}/jakarta-restful-ws-tck-3.0.2.zip</file>
+ <file>${project.build.directory}/${tck.test.rest.file}</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml
index c698bec..52574e1 100644
--- a/appserver/tests/tck/tck-download/pom.xml
+++ b/appserver/tests/tck/tck-download/pom.xml
@@ -59,6 +59,7 @@
<modules>
<module>jakarta-rest-tck</module>
<module>jakarta-faces-tck</module>
+ <module>jakarta-pages-tck</module>
<module>jakarta-authentication-tck</module>
</modules>
</profile>
