Migrate the core-tck-runner for Jakarta EE 11 Core Profile.

Signed-off-by: James R. Perkins <[email protected]>

.github/workflows/core-profile-tck.yml → .github/workflows/core-profile-tck-ee11.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow that is manually triggered
 
-name: Jakarta EE Core Profile with WildFly
+name: Jakarta EE 11 Core Profile with WildFly
 
 # Controls when the action will run. Workflow runs when manually triggered using the UI
 # or API.
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        java: ['11', '17', '21']
+        java: ['17', '21']
 
     # Runner steps
     steps:

core-profile/cdi-langmodel-tck/pom.xml

@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core-test-common</artifactId>
-            <version>${weld.version}</version>
+            <version>${version.org.jboss.weld}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

core-profile/cdi-tck/pom.xml

@@ -23,7 +23,7 @@
     <name>WildFly Jakarta CDI TCK Runner</name>
 
     <properties>
-        <testng.version>7.4.0</testng.version>
+        <testng.version>7.9.0</testng.version>
     </properties>
 
     <dependencies>
@@ -92,7 +92,7 @@
             <artifactId>cdi-tck-core-impl</artifactId>
             <version>${cdi.tck.version}</version>
             <type>sig</type>
-            <classifier>sigtest-jdk11</classifier>
+            <classifier>sigtest-jdk17</classifier>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-porting-package-tck</artifactId>
-            <version>${weld.version}</version>
+            <version>${version.org.jboss.weld}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -162,7 +162,6 @@
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
             <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-            <version>${version.org.jboss.arquillian}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -220,7 +219,7 @@
                             <includeGroupIds>jakarta.enterprise</includeGroupIds>
                             <includeArtifactIds>cdi-tck-core-impl</includeArtifactIds>
                             <type>sig</type>
-                            <classifier>sigtest-jdk11</classifier>
+                            <classifier>sigtest-jdk17</classifier>
                             <stripVersion>true</stripVersion>
                             <overWriteReleases>true</overWriteReleases>
                             <outputDirectory>${project.build.directory}/sigtest</outputDirectory>
@@ -270,7 +269,7 @@
                                 <fileset id="jakarta-api-jars"
                                          dir="${jboss.home}${file.separator}modules/system/layers/base/jakarta/">
                                     <include name="**/annotation/api/main/*.jar"/>
-                                    <include name="**/el/main/*.jar"/>
+                                    <include name="**/el/api/main/*.jar"/>
                                     <include name="**/enterprise/api/main/*.jar"/>
                                     <include name="**/inject/api/main/*.jar"/>
                                     <include name="**/interceptor/api/main/*.jar"/>
@@ -291,6 +290,20 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>echo</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo message="sigtest.classpath=${sigtest.classpath}"/>
+                                <echo message="jakarta.api.jars=${jakarta.api.jars}"/>
+                                <echo message="impl.jars=${impl.jars}"/>
+                            </target>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -368,13 +381,8 @@
             </plugin>
 
             <plugin>
-                <groupId>org.netbeans.tools</groupId>
+                <groupId>jakarta.tck</groupId>
                 <artifactId>sigtest-maven-plugin</artifactId>
-                <version>1.7</version>
-                <configuration>
-                    <!-- Avoids an NPE fixed upstream -->
-                    <ignoreJDKClasses/>
-                </configuration>
                 <executions>
                     <execution>
                         <id>sigtest</id>
@@ -383,7 +391,7 @@
                             <goal>check</goal>
                         </goals>
                         <configuration>
-                            <sigfile>${project.build.directory}/sigtest/cdi-tck-core-impl-sigtest-jdk11.sig</sigfile>
+                            <sigfile>${project.build.directory}/sigtest/cdi-tck-core-impl-sigtest-jdk17.sig</sigfile>
                             <packages>jakarta.decorator,jakarta.enterprise,jakarta.interceptor</packages>
                             <classes>${project.build.directory}/sig-classes/</classes>
                             <report>${project.build.directory}/cdi-sig-report.txt</report>

core-profile/inject-tck/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <version>${weld.version}</version>
+            <version>${version.org.jboss.weld}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

core-profile/jsonb-standalone-tck/pom.xml

@@ -33,7 +33,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
             <scope>test</scope>
         </dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <version>${weld.version}</version>
+            <version>${version.org.jboss.weld}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

core-profile/jsonp-plugability-tck/pom.xml

@@ -33,7 +33,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
             <scope>test</scope>
         </dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <version>${weld.version}</version>
+            <version>${version.org.jboss.weld}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

core-profile/jsonp-standalone-tck/pom.xml

@@ -34,7 +34,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
             <scope>test</scope>
         </dependency>

core-profile/pom.xml

@@ -49,7 +49,7 @@
     </developers>
 
     <organization>
-        <name>Jakarta Core Profile TCK Runner (10.0) for WildFly</name>
+        <name>Jakarta Core Profile TCK Runner (11.0) for WildFly</name>
         <url>https://github.com/wildfly/wildfly-tck-runners</url>
     </organization>
 
@@ -84,30 +84,31 @@
 
         <!-- Jakarta EE APIs Core -->
         <inject.api.version>2.0.1</inject.api.version>
-        <cdi.api.version>4.0.1</cdi.api.version>
-        <el.api.version>5.0.0</el.api.version>
+        <cdi.api.version>4.1.0</cdi.api.version>
+        <version.jakarta.el>6.0.1</version.jakarta.el>
         <jsonp.tck.version>2.1.1</jsonp.tck.version>
         <jsonb.tck.version>3.0.0</jsonb.tck.version>
         <core.profile.tck.version>10.0.3</core.profile.tck.version>
-        <cdi.tck.version>4.0.13</cdi.tck.version>
+        <cdi.tck.version>4.1.0</cdi.tck.version>
         <cdi.tck.dist.version>${cdi.tck.version}</cdi.tck.dist.version>
-        <rest.tck.version>3.1.4</rest.tck.version>
+        <rest.tck.version>4.0.1</rest.tck.version>
 
         <!-- Test tools/dependencies -->
-        <version.org.jboss.arquillian>1.7.2.Final</version.org.jboss.arquillian>
+        <version.org.jboss.arquillian>1.9.1.Final</version.org.jboss.arquillian>
+        <version.org.jboss.arquillian.jakarta>10.0.0.Final</version.org.jboss.arquillian.jakarta>
         <shrinkwrap.ee.descriptors.impl.version>2.0.0</shrinkwrap.ee.descriptors.impl.version>
         <apache.httpclient.version>3.1</apache.httpclient.version>
-        <glassfish.jakarta.el.version>4.0.2</glassfish.jakarta.el.version>
-        <jupiter.version>5.10.4</jupiter.version>
-        <sigtest.plugin.version>1.7</sigtest.plugin.version>
+        <version.org.glassfish.expressly>6.0.0-M1</version.org.glassfish.expressly>
+        <jupiter.version>5.11.1</jupiter.version>
+        <sigtest.plugin.version>2.2</sigtest.plugin.version>
         <signature.sigTestClasspath/>
 
-        <weld.version>5.1.2.Final</weld.version>
-        <resteasy.version>6.2.10.Final</resteasy.version>
-        <version.org.wildfly.arquillian>5.0.1.Final</version.org.wildfly.arquillian>
+        <version.org.jboss.weld>6.0.0.Beta4</version.org.jboss.weld>
+        <resteasy.version>7.0.0.Alpha3</resteasy.version>
+        <version.org.wildfly.arquillian>5.1.0.Beta6</version.org.wildfly.arquillian>
         <wildfly.plugin.version>5.0.1.Final</wildfly.plugin.version>
 
-        <version.org.wildfly>33.0.0.Beta1</version.org.wildfly>
+        <version.org.wildfly>33.0.2.Final</version.org.wildfly>
 
         <!--gc.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006</gc.args-->
         <failsafe.plugin.jdk17.args/>
@@ -116,7 +117,7 @@
 
         <!-- Provisioning properties -->
         <feature.pack.groupId>org.wildfly</feature.pack.groupId>
-        <feature.pack.artifactId>wildfly-ee-galleon-pack</feature.pack.artifactId>
+        <feature.pack.artifactId>wildfly-preview-feature-pack</feature.pack.artifactId>
         <feature.pack.version>${version.org.wildfly}</feature.pack.version>
 
         <galleon.fork.embedded>true</galleon.fork.embedded>
@@ -149,6 +150,17 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>jakarta.el</groupId>
+                <artifactId>jakarta.el-api</artifactId>
+                <version>${version.jakarta.el}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>cdi-tck-api</artifactId>
@@ -206,37 +218,36 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.jakarta</groupId>
+                <artifactId>arquillian-jakarta-bom</artifactId>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
-                <artifactId>wildfly-arquillian-container-managed</artifactId>
+                <artifactId>wildfly-arquillian-bom</artifactId>
                 <version>${version.org.wildfly.arquillian}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.glassfish.expressly</groupId>
+                <artifactId>expressly</artifactId>
+                <version>${version.org.glassfish.expressly}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.slf4j</groupId>
+                        <groupId>*</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${jupiter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>${jupiter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${jupiter.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.netbeans.tools</groupId>
+                <groupId>jakarta.tck</groupId>
                 <artifactId>sigtest-maven-plugin</artifactId>
                 <version>${sigtest.plugin.version}</version>
             </dependency>
@@ -248,7 +259,7 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.netbeans.tools</groupId>
+                    <groupId>jakarta.tck</groupId>
                     <artifactId>sigtest-maven-plugin</artifactId>
                     <version>${sigtest.plugin.version}</version>
                 </plugin>

core-profile/rest-tck/pom.xml

@@ -99,14 +99,8 @@
             <version>2.2</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>${sigtest.plugin.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- SeBootstrap TCK dependencies -->
@@ -172,6 +166,7 @@
                                     <include name="**/json/bind/api/main/*.jar"/>
                                     <include name="**/inject/api/main/*.jar"/>
                                     <include name="**/interceptor/api/main/*.jar"/>
+                                    <include name="**/mail/api/main/*.jar"/>
                                     <include name="**/ws/rs/api/main/*.jar"/>
                                     <include name="**/xml/bind/api/main/*.jar"/>
                                 </fileset>
@@ -194,7 +189,11 @@
                                     <include name="**/jboss/resteasy/resteasy-core-spi/main/*.jar"/>
                                     <include name="**/jboss/resteasy/resteasy-jaxb-provider/main/*.jar"/>
                                     <include name="**/jboss/resteasy/resteasy-json-binding-provider/main/*.jar"/>
+                                    <include name="**/jboss/resteasy/resteasy-multipart-provider/main/*.jar"/>
                                     <include name="**/apache/httpcomponents/core/main/*.jar"/>
+                                    <!-- Required for the multipart provider -->
+                                    <include name="**/apache/james/mime4j/main/*.jar"/>
+                                    <include name="**/apache/commons/io/main//*.jar"/>
                                     <include name="**/glassfish/jaxb/main/*.jar"/>
                                     <include name="**/reactivestreams/main/*.jar"/>
                                 </fileset>

core-profile/tck-setup/pom.xml

@@ -53,11 +53,11 @@
                                      dest="${tck.dir}/"
                                      verbose="false"
                                      usetimestamp="true"/>
-                                <get src="https://download.eclipse.org/jakartaee/restful-ws/3.1/jakarta-restful-ws-tck-${rest.tck.version}.zip"
+                                <get src="https://download.eclipse.org/jakartaee/restful-ws/4.0/jakarta-restful-ws-tck-${rest.tck.version}.zip"
                                      dest="${tck.dir}/"
                                      verbose="false"
                                      usetimestamp="true"/>
-                                <get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${cdi.tck.dist.version}-dist.zip"
+                                <get src="https://download.eclipse.org/jakartaee/cdi/4.1/cdi-tck-${cdi.tck.dist.version}-dist.zip"
                                      dest="${tck.dir}/"
                                      verbose="false"
                                      usetimestamp="true"/>
@@ -201,7 +201,7 @@
                             <artifactId>jakarta-restful-ws-tck</artifactId>
                             <version>${rest.tck.version}</version>
                             <packaging>jar</packaging>
-                            <file>${tck.dir}/rest-tck/jakarta-restful-ws-tck-${rest.tck.version}.jar</file>
+                            <file>${tck.dir}/rest-tck/restful-ws-tck/artifacts/jakarta-restful-ws-tck-${rest.tck.version}.jar</file>
                             <generatePom>true</generatePom>
                         </configuration>
                     </execution>
@@ -247,8 +247,8 @@
                             <artifactId>cdi-tck-core-impl</artifactId>
                             <version>${cdi.tck.dist.version}</version>
                             <packaging>sig</packaging>
-                            <classifier>sigtest-jdk11</classifier>
-                            <file>${tck.dir}/cdi-tck-${cdi.tck.dist.version}/artifacts/cdi-tck-core-impl-${cdi.tck.dist.version}-sigtest-jdk11.sig</file>
+                            <classifier>sigtest-jdk17</classifier>
+                            <file>${tck.dir}/cdi-tck-${cdi.tck.dist.version}/artifacts/cdi-tck-core-impl-${cdi.tck.dist.version}-sigtest-jdk17.sig</file>
                             <generatePom>false</generatePom>
                         </configuration>
                     </execution>