Skip to content

Commit

Permalink
reorg_cdi_tck_folders (#3948)
Browse files Browse the repository at this point in the history
  • Loading branch information
arjantijms authored Sep 11, 2024
1 parent 80c56d3 commit f9b7939
Show file tree
Hide file tree
Showing 15 changed files with 697 additions and 415 deletions.
76 changes: 76 additions & 0 deletions external/tck/coreprofile/cdi/installer/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<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>cloud.piranha.external.tck.coreprofile</groupId>
<artifactId>cdi-tck</artifactId>
<version>24.9.0-SNAPSHOT</version>
</parent>

<artifactId>installer</artifactId>
<packaging>pom</packaging>

<name>Piranha Core Profile - Jakarta CDI TCK - Installer</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>pre-integration-test</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Download, unzip and rename TCK -->
<get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${cdi.tck.version}-dist.zip"
dest="${project.build.directory}/tck.zip"
skipexisting="true"/>
<unzip src="${project.build.directory}/tck.zip"
dest="${project.build.directory}"/>
<move file="${project.build.directory}/cdi-tck-${cdi.tck.version}"
tofile="${project.build.directory}/tck"/>

<!-- Install the TCK artifacts into local repository -->
<exec dir="${project.build.directory}/tck/artifacts"
executable="mvn">
<arg value="install"/>
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/runner/target</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project>
84 changes: 9 additions & 75 deletions external/tck/coreprofile/cdi/pom.xml
Original file line number Diff line number Diff line change
@@ -1,87 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<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">
<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>cloud.piranha.external.tck.coreprofile</groupId>
<artifactId>project</artifactId>
<version>24.9.0-SNAPSHOT</version>
</parent>

<artifactId>cdi-tck</artifactId>
<packaging>pom</packaging>

<name>Piranha Core Profile - Jakarta CDI TCK</name>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>cloud.piranha</groupId>
<artifactId>bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>pre-integration-test</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Download, unzip and rename TCK -->
<get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${cdi.tck.version}-dist.zip"
dest="${project.build.directory}/tck.zip"
skipexisting="true"/>
<unzip src="${project.build.directory}/tck.zip"
dest="${project.build.directory}"/>
<move file="${project.build.directory}/cdi-tck-${cdi.tck.version}"
tofile="${project.build.directory}/tck"/>

<!-- Install the TCK artifacts into local repository -->
<exec dir="${project.build.directory}/tck/artifacts"
executable="mvn">
<arg value="install"/>
</exec>
</target>
</configuration>
</execution>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Run the tests -->
<exec dir="${project.build.directory}/../runner"
executable="mvn"
failonerror="true">
<arg value="verify"/>
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/runner/target</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>

<modules>
<module>installer</module>
<module>runner</module>
</modules>
</project>
Loading

0 comments on commit f9b7939

Please sign in to comment.