Skip to content

Commit

Permalink
Merge pull request #1743 from arjantijms/ejb_runner_parent
Browse files Browse the repository at this point in the history 
Fix runner pom
  • Loading branch information
@arjantijms
arjantijms authored Jan 11, 2025
2 parents 507793e + 645b886 commit 1a5fc92
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 46 deletions.
68 changes: 31 additions & 37 deletions glassfish-runner/enterprise-beans-tck/enterprise-beans-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,86 +19,80 @@
<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>enterprise-beans-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>enterprise-beans-tck-install</artifactId>
<packaging>pom</packaging>
<name>TCK: Install Jakarta Enterprise-beans TCK</name>
<name>TCK: Install Jakarta enterprise-beans TCK</name>

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

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.11.0</version>
<version>1.9.0</version>
<configuration>
<url>${tck.test.enterprise-beans.url}</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>download-ejb-tck</id>
<id>download-enterprise-beans-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>
<skipCache>true</skipCache>
</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-enterprise-beans-tck-ejb30</id>
<goals>
<goal>run</goal>
<goal>install-file</goal>
</goals>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<configuration>
<streamLogs>true</streamLogs>
<projectsDirectory>${project.build.directory}/platform-tck-main</projectsDirectory>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
<goals>clean install</goals>
<file>${project.build.directory}/ejb30/target/ejb30-${tck.test.enterprise-beans.version}.jar</file>
<groupId>jakarta.tck</groupId>
<artifactId>ejb30</artifactId>
<version>${tck.test.enterprise-beans.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>

<execution>
<id>ejb_source</id>
<id>install-enterprise-beans-tck-ejb32</id>
<goals>
<goal>run</goal>
<goal>install-file</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<streamLogs>true</streamLogs>
<projectsDirectory>${project.build.directory}/platform-tck-main</projectsDirectory>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
<goals>clean source:jar install -pl ":ejb30" -pl ":ejb32"</goals>
<file>${project.build.directory}/ejb32/target/ejb32-${tck.test.enterprise-beans.version}.jar</file>
<groupId>jakarta.tck</groupId>
<artifactId>ejb32</artifactId>
<version>${tck.test.enterprise-beans.version}</version>
<packaging>jar</packaging>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
14 changes: 8 additions & 6 deletions glassfish-runner/enterprise-beans-tck/enterprise-beans-tck-run/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish</groupId>
<artifactId>enterprise-beans-tck</artifactId>
<version>4.0.0-SNAPSHOT</version>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>enterprise-beans-tck-run</artifactId>
Expand Down Expand Up @@ -64,7 +65,8 @@
<version.jakarta.enterprise>4.0.1</version.jakarta.enterprise>
<version.jakarta.inject>2.0.1</version.jakarta.inject>
<version.jakarta.servlet>5.0.0</version.jakarta.servlet>
<version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
<version.jakarta.tck>11.0.0-M2</version.jakarta.tck>
<version.ejb.tck>4.0.0-M1</version.ejb.tck>
<version.jakarta.tck.arquillian>1.0.0-SNAPSHOT</version.jakarta.tck.arquillian>

</properties>
Expand Down Expand Up @@ -140,13 +142,13 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>ejb30</artifactId>
<version>${version.jakarta.tck}</version>
<version>${version.ejb.tck}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>ejb32</artifactId>
<version>${version.jakarta.tck}</version>
<version>${version.ejb.tck}</version>
<scope>test</scope>
</dependency>

Expand Down
7 changes: 4 additions & 3 deletions glassfish-runner/enterprise-beans-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
<relativePath />
</parent>

<artifactId>enterprise-beans-tck</artifactId>
Expand Down

0 comments on commit 1a5fc92

Please sign in to comment.