Fixes piranhacloud#4035 - Add CDI TCK for Piranha Web Profile (piranh…

…acloud#4036)
mnriem · Sep 28, 2024 · aea432a · aea432a
1 parent 6c9a24a
commit aea432a
Show file tree

Hide file tree

Showing 15 changed files with 1,058 additions and 0 deletions.
diff --git a/.github/workflows/tck-webprofile.yml b/.github/workflows/tck-webprofile.yml
@@ -41,6 +41,31 @@ jobs:
       with:
         paths: "external/webprofile-tck/atinject/target/tck/example/target/surefire-reports/TEST-*.xml"
       if: always()
+  cdi:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [ '21' ]
+        os: [ubuntu-latest]
+    steps:
+    - name: Checkout Sources
+      uses: actions/checkout@v4
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+    - name: Setup for TCK
+      run: mvn -B -DskipTests=true -ntp install
+    - name: Run TCK
+      run: |
+        cd external/webprofile-tck/cdi
+        mvn -B -fae -ntp verify
+    - name: Test Summary
+      uses: test-summary/action@v2
+      with:
+        paths: "external/webprofile-tck/cdi/runner/core/target/surefire-reports/junitreports/TEST-*.xml"
+      if: always()
   jsonb:
     runs-on: ${{ matrix.os }}
     strategy:

diff --git a/external/webprofile-tck/cdi/installer/pom.xml b/external/webprofile-tck/cdi/installer/pom.xml
@@ -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.webprofiletck.cditck</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>installer</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha Web Profile - 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>
diff --git a/external/webprofile-tck/cdi/pom.xml b/external/webprofile-tck/cdi/pom.xml
@@ -0,0 +1,22 @@
+<?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.webprofiletck</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>cloud.piranha.external.webprofiletck.cditck</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Piranha Web Profile - CDI TCK - Project</name>
+
+    <modules>
+        <module>installer</module>
+        <module>runner</module>
+    </modules>
+</project>