Skip to content

Commit

Permalink
Merge pull request #1783 from arjantijms/transactions_runner_prebuild
Browse files Browse the repository at this point in the history 
Transactions runner uses prebuild transactions TCK and acc switch
  • Loading branch information
@arjantijms
arjantijms authored Jan 18, 2025
2 parents 13040d6 + 952276e commit 7d2e381
Show file tree
Hide file tree
Showing 2 changed files with 164 additions and 161 deletions.
79 changes: 27 additions & 52 deletions glassfish-runner/transactions-tck/transactions-tck-install/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation. All rights reserved.
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
Expand All @@ -19,93 +19,68 @@
<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</groupId>
<artifactId>transactions-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>transactions-tck-install</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TCK: Install Jakarta transactions TCK</name>
<name>TCK: Install Jakarta Transactions TCK</name>

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

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.11.0</version>
<version>1.13.0</version>
<configuration>
<url>${tck.test.transactions.url}</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
<executions>

<execution>
<id>download-tck-tools</id>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<url>https://github.com/eclipse-ee4j/jakartaee-tck-tools/archive/refs/heads/master.zip</url>
</configuration>
</execution>
<execution>
<id>download-transactions-tck</id>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<excludes>**/extensions.xml</excludes>
<url>https://github.com/jakartaee/platform-tck/archive/refs/heads/main.zip</url>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.8.0</version>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.3</version>
<executions>

<!-- Build and install the platform TCK -->
<execution>
<id>tck_full_build</id>
<id>install-transactions-tck-pom</id>
<goals>
<goal>run</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<streamLogs>true</streamLogs>
<projectsDirectory>${project.build.directory}/platform-tck-main</projectsDirectory>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
<goals>clean install</goals>
</configuration>
</execution>

<!-- Build and install the Arquillian tools for the TCK -->
<execution>
<id>tools_build</id>
<goals>
<goal>run</goal>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<streamLogs>true</streamLogs>
<projectsDirectory>${project.build.directory}/jakartaee-tck-tools-master/arquillian</projectsDirectory>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
<goals>clean source:jar install -DskipTests</goals>
<file>${project.build.directory}/transactions-tck-${tck.test.transactions.version}.jar</file>
<sources>${project.build.directory}/transactions-tck-${tck.test.transactions.version}-sources.jar</sources>
<groupId>jakarta.tck</groupId>
<artifactId>transactions-tck</artifactId>
<version>${tck.test.transactions.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
Loading

0 comments on commit 7d2e381

Please sign in to comment.