forked from piranhacloud/piranha
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'current' into issue-3851
- Loading branch information
Showing
10 changed files
with
540 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| <?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"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>tck</groupId> | ||
| <artifactId>cdi-runner</artifactId> | ||
| <version>1-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
| <name>Piranha - External - TCK - CoreProfile - Jakarta CDI TCK - Runner</name> | ||
| <properties> | ||
| <piranha.version>24.9.0-SNAPSHOT</piranha.version> | ||
| </properties> | ||
| <dependencyManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.jboss.arquillian</groupId> | ||
| <artifactId>arquillian-bom</artifactId> | ||
| <version>1.8.0.Final</version> | ||
| <scope>test</scope> | ||
| <type>pom</type> | ||
| </dependency> | ||
| </dependencies> | ||
| </dependencyManagement> | ||
| <profiles> | ||
| <profile> | ||
| <id>unix</id> | ||
| <activation> | ||
| <os> | ||
| <family>unix</family> | ||
| </os> | ||
| </activation> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>cloud.piranha.arquillian</groupId> | ||
| <artifactId>piranha-arquillian-jarcontainer</artifactId> | ||
| <version>${piranha.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.testng</groupId> | ||
| <artifactId>testng</artifactId> | ||
| <version>6.9.8</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jakarta.enterprise</groupId> | ||
| <artifactId>cdi-tck-core-impl</artifactId> | ||
| <version>4.0.13</version> | ||
| <scope>test</scope> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>jakarta.el</groupId> | ||
| <artifactId>jakarta.el-api</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <groupId>jakarta.faces</groupId> | ||
| <artifactId>jakarta.faces-api</artifactId> | ||
| </exclusion> | ||
| <exclusion> | ||
| <artifactId>container-se-api</artifactId> | ||
| <groupId>org.jboss.arquillian.container</groupId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.arquillian.protocol</groupId> | ||
| <artifactId>arquillian-protocol-servlet-jakarta</artifactId> | ||
| <version>1.8.0.Final</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <!-- | ||
| Create a JAR file for the test resources and stick it in | ||
| ${project.build.directory}/dependency/lib so it can be | ||
| referred to by org.jboss.cdi.tck.libraryDirectory | ||
| property when the time comes. Needed for | ||
| META-INF/cdi-tck.properties resolution. | ||
| --> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>3.4.2</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>process-test-classes</phase> | ||
| <goals> | ||
| <goal>test-jar</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> | ||
| <archive> | ||
| <manifest> | ||
| <addClasspath>false</addClasspath> | ||
| </manifest> | ||
| </archive> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>3.3.1</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <dependenciesToScan> | ||
| <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency> | ||
| </dependenciesToScan> | ||
| <excludedGroups>cdi-full,se</excludedGroups> | ||
| <forkCount>1</forkCount> | ||
| <properties> | ||
| <property> | ||
| <name>surefire.testng.verbose</name> | ||
| <value>1</value> | ||
| </property> | ||
| </properties> | ||
| <reuseForks>false</reuseForks> | ||
| <systemPropertyVariables> | ||
| <org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory> | ||
| </systemPropertyVariables> | ||
| <testFailureIgnore>true</testFailureIgnore> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-report-plugin</artifactId> | ||
| <version>3.3.1</version> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-test-report</id> | ||
| <phase>test</phase> | ||
| <goals> | ||
| <goal>report-only</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <outputDirectory>target/surefire-reports</outputDirectory> | ||
| <outputName>test-report</outputName> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
4 changes: 4 additions & 0 deletions
4
external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| org.jboss.cdi.tck.testDataSource=java:comp/DefaultDataSource | ||
| org.jboss.cdi.tck.testJmsConnectionFactory=java:/ConnectionFactory | ||
| org.jboss.cdi.tck.testJmsQueue=java:/queue/test | ||
| org.jboss.cdi.tck.testJmsTopic=java:/topic/test |
5 changes: 5 additions & 0 deletions
5
external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> | ||
| <defaultProtocol type="Servlet 5.0"/> | ||
| </arquillian> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?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"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>cloud.piranha.external.tck.coreprofile</groupId> | ||
| <artifactId>project</artifactId> | ||
| <version>24.9.0-SNAPSHOT</version> | ||
| </parent> | ||
| <groupId>cloud.piranha.external.tck.coreprofile.cdi</groupId> | ||
| <artifactId>project</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>Piranha - External - TCK - CoreProfile - 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> | ||
| <profiles> | ||
| <profile> | ||
| <id>unix</id> | ||
| <activation> | ||
| <os> | ||
| <family>unix</family> | ||
| </os> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>validate</id> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| <configuration> | ||
| <target xmlns:if="ant:if" xmlns:unless="ant:unless"> | ||
| <echo>Executing UNIX profile</echo> | ||
|
|
||
| <!-- Download, unzip and rename TCK --> | ||
| <get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-4.0.13-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-4.0.13" | ||
| 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> | ||
|
|
||
| <!-- Copy testsuite --> | ||
| </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}/../cdi-runner" | ||
| executable="mvn"> | ||
| <arg value="test"/> | ||
| </exec> | ||
| </target> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
Oops, something went wrong.