Skip to content

Commit

Permalink
Merge pull request #1657 from arjantijms/transactions_gf_runner
Browse files Browse the repository at this point in the history
Transactions gf runner
  • Loading branch information
arjantijms authored Nov 19, 2024
2 parents 56e5619 + e4dfdd4 commit 5eb9121
Show file tree
Hide file tree
Showing 21 changed files with 186 additions and 135 deletions.
2 changes: 1 addition & 1 deletion glassfish-runner/batch-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
</modules>

<properties>
<glassfish.version>7.0.0-M10</glassfish.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<glassfish.version>7.0.0-M10</glassfish.version>
<jakarta.batch.version>2.1.0</jakarta.batch.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/batch-tck/sigtests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<artifactId>glassfish.batch-tck.sigtests</artifactId>

<properties>
<glassfish.version>7.0.0-M10</glassfish.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<glassfish.version>7.0.0-M10</glassfish.version>
<jakarta.batch.version>2.1.5</jakarta.batch.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/cdi-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

<properties>
<cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
<cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>

<cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
<cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
<glassfish.root>${project.build.directory}</glassfish.root>

<!-- Note M6 still has some failures, future M7 passes all -->
Expand Down
7 changes: 3 additions & 4 deletions glassfish-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
<module>jsonb-tck</module>
<module>jsonp-tck</module>
<module>pages-tck</module>
<module>jpa-platform-tck</module>
<module>persistence-platform-tck</module>
<module>servlet-tck</module>
</modules>

<properties>
<arquillian.version>1.9.1.Final</arquillian.version>
<glassfish-artifact-id>glassfish</glassfish-artifact-id>
<glassfish.version>7.0.0</glassfish.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
<glassfish.version>7.0.0</glassfish.version>
<jakarta.rest.version>3.1.0</jakarta.rest.version>
<json.tck.version>2.1.0</json.tck.version>
<jsonb.tck.version>3.0.0</jsonb.tck.version>
<maven.compiler.source>11</maven.compiler.source>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
<arquillian.version>1.9.1.Final</arquillian.version>
</properties>

<dependencyManagement>
Expand All @@ -66,7 +66,6 @@
</dependency>
</dependencies>
</dependencyManagement>


<repositories>
<repository>
Expand Down
17 changes: 0 additions & 17 deletions glassfish-runner/transactions-platform-tck/j2ee.pass

This file was deleted.

16 changes: 0 additions & 16 deletions glassfish-runner/transactions-platform-tck/javajoe.pass

This file was deleted.

36 changes: 36 additions & 0 deletions glassfish-runner/transactions-tck/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024 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.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>transactions-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>transactions-tck-install</module>
<module>transactions-tck-run</module>
</modules>
</project>
112 changes: 112 additions & 0 deletions glassfish-runner/transactions-tck/transactions-tck-install/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2024 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</groupId>
<artifactId>transactions-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>transactions-tck-install</artifactId>
<packaging>pom</packaging>
<name>TCK: Install Jakarta transactions TCK</name>

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.11.0</version>
<configuration>
<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>
<executions>

<!-- Build and install the platform TCK -->
<execution>
<id>tck_full_build</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>
</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</goals>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading

0 comments on commit 5eb9121

Please sign in to comment.