Skip to content

Commit

Permalink
Rework the runner for the extra websocket tests
Browse files Browse the repository at this point in the history
Add an installer, using the prebuild extra websocket jar
Remove unneeded plugins and properties
Format and order
  • Loading branch information
arjantijms committed Jan 20, 2025
1 parent 1d16a2a commit 717d83d
Show file tree
Hide file tree
Showing 9 changed files with 455 additions and 379 deletions.
38 changes: 38 additions & 0 deletions glassfish-runner/websocket-platform-extra-tck/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?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>

<groupId>jakarta.tck</groupId>
<artifactId>websocket-platform-extra-tck</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>websocket-platform-extra-tck-install</module>
<module>websocket-platform-extra-tck-run</module>
</modules>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2025 Contributors to the Eclipse Foundation.
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>

<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck-install</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TCK: Install Jakarta websocket Extra TCK</name>

<properties>
<tck.test.websocket.file>jakarta-websocket-tck-${tck.test.websocket.version}.zip</tck.test.websocket.file>
<tck.test.websocket.url>https://download.eclipse.org/jakartaee/websocket/2.2/${tck.test.websocket.file}</tck.test.websocket.url>

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

<tck.test.websocket.version>2.2.0</tck.test.websocket.version>
</properties>

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

<plugin>
<artifactId>maven-install-plugin</artifactId>
<executions>

<execution>
<id>install-websocket-tck-common-jar</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-common-${tck.test.websocket.version}.jar</file>
<sources>${project.build.directory}/websocket-tck/artifacts/websocket-tck-common-${tck.test.websocket.version}-sources.jar</sources>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck-common</artifactId>
<version>${tck.test.websocket.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>

<execution>
<id>install-websocket-tck-common-pom</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-common-${tck.test.websocket.version}.pom</file>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck-common</artifactId>
<version>${tck.test.websocket.version}</version>
<packaging>pom</packaging>
</configuration>
</execution>
<execution>
<id>install-websocket-tck-pom</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-${tck.test.websocket.version}.pom</file>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck</artifactId>
<version>${tck.test.websocket.version}</version>
<packaging>pom</packaging>
</configuration>
</execution>

<execution>
<id>websocket-tck-spec-tests-jar</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-spec-tests-${tck.test.websocket.version}.jar</file>
<sources>${project.build.directory}/websocket-tck/artifacts/websocket-tck-spec-tests-${tck.test.websocket.version}-sources.jar</sources>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck-spec-tests</artifactId>
<version>${tck.test.websocket.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>

<execution>
<id>websocket-tck-spec-tests-pom</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<file>${project.build.directory}/websocket-tck/artifacts/websocket-tck-spec-tests-${tck.test.websocket.version}.pom</file>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck-spec-tests</artifactId>
<version>${tck.test.websocket.version}</version>
<packaging>pom</packaging>
</configuration>
</execution>

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

</plugins>
</build>

</project>
Loading

0 comments on commit 717d83d

Please sign in to comment.