Skip to content

Commit

Permalink
Merge pull request #1780 from arjantijms/pages_extra
Browse files Browse the repository at this point in the history
Use term "extra" for Pages and add installer for prebuild TCK jar
  • Loading branch information
arjantijms authored Jan 17, 2025
2 parents 8ac21ac + b055366 commit c9b464e
Show file tree
Hide file tree
Showing 14 changed files with 125 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2025 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.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>pages-extra-tck-install</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TCK: Install Jakarta Pages Platform Extra TCK</name>

<properties>
<tck.test.pages-extra.file>jakarta-pages-extra-tck-${tck.test.pages-extra.version}.zip</tck.test.pages-extra.file>
<tck.test.pages-extra.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.pages-extra.file}</tck.test.pages-extra.url>
<tck.test.pages-extra.version>4.0.0-M1</tck.test.pages-extra.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.13.0</version>
<configuration>
<url>${tck.test.pages-extra.url}</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>download-pages-extra-tck</id>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.3</version>
<executions>
<execution>
<id>install-pages-extra-tck-pom</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}.jar</file>
<sources>${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}-sources.jar</sources>
<groupId>jakarta.tck</groupId>
<artifactId>pages-platform-tck</artifactId>
<version>${tck.test.pages-extra.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<jakarta.platform.version>11.0.0-M4</jakarta.platform.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<tck.artifactId>pages-platform-tck</tck.artifactId>
<tck.version>11.0.0-SNAPSHOT</tck.version>
<tck.version>4.0.0-M1</tck.version>
</properties>

<!-- The Junit5 test frameworks -->
Expand Down
37 changes: 37 additions & 0 deletions glassfish-runner/pages-platform-extra-tck/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation.
Copyright (c) 2022 Oracle and/or its affiliates. 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.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>pages-platform-extra-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>pages-platform-extra-tck-install</module>
<module>pages-platform-extra-tck-run</module>
</modules>
</project>

0 comments on commit c9b464e

Please sign in to comment.