Merge pull request #91 from jamezp/updates

Several component upgrades and updates for the Jakarta EE 10 Core TCK Runner
wildfly · Oct 10, 2023 · ac02886 · ac02886
2 parents 587e24b + fde9e83
commit ac02886
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 116 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,22 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # WildFly Jakarta EE Core TCK Runner
+  - package-ecosystem: "maven"
+    directory: "/wf-core-tck-runner"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: '*:*'
+        update-types: ['version-update:semver-major', 'version-update:semver-minor']
+    open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/run-coreprofile-tck.yml b/.github/workflows/run-coreprofile-tck.yml
@@ -5,61 +5,63 @@ name: Jakarta EE Core Profile with WildFly
 # Controls when the action will run. Workflow runs when manually triggered using the UI
 # or API.
 on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+    branches:
+      - '**'
+  schedule:
+    - cron: '0 0 * * *' # Every day at 00:00 UTC
   workflow_dispatch:
-    inputs:
-      downloadUrl:
-        # Friendly description to be shown in the UI instead of 'name'
-        description: 'WildFly Download URL'
-        # Default value if no value is explicitly provided
-        default: 'https://ci.wildfly.org/guestAuth/repository/download/WF_Nightly/latest.lastSuccessful/wildfly-latest-SNAPSHOT.zip'
-        # Input has to be provided for the workflow to run
-        required: true
-      javaVersion:
-        description: "Java Version"
-        required: true
-        default: "11"
-        type: choice
-        options:
-          - "11"
-          - "17"
+
+# Only run the latest job
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
+  wildfly-build:
+    uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main
+    with:
+      wildfly-branch: "main"
+      wildfly-repo: "wildfly/wildfly"
   coreprofile-tck:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
+    needs: wildfly-build
     strategy:
       fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        java: ['11', '17']
 
     # Runner steps
     steps:
     - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: wildfly-maven-repository
+        path: .
+    - name: Extract Maven Repo
+      shell: bash
+      run: tar -xzf wildfly-maven-repository.tar.gz -C ~
     - name: Setup Java JDK
       uses: actions/setup-java@v3
       with:
-        java-version: ${{ inputs.javaVersion }}
+        java-version: ${{ matrix.java }}
         distribution: 'temurin'
         cache: 'maven'
-
-    - name: Check environment
-      run: bash -c "echo JAVA_HOME=${{ env.JAVA_HOME }}; java -version; mvn -version;"
-    - name: Download the WildFly Nightly and setup the JBOSS_HOME
-      run: |
-        wget ${{ inputs.downloadUrl }} -O wildfly-download.zip
-        unzip wildfly-download.zip
-        rm -rfv wildfly*-src.zip wildfly-download.zip
-        unzip wildfly-*.zip
-        rm -rfv wildfly-*.zip
-        JBOSS_HOME="$(readlink -m wildfly-*)"
-        echo -e "JBOSS_HOME=$JBOSS_HOME" >> $GITHUB_ENV
-    - name: Build with Maven Java ${{ inputs.javaVersion }} on WildFly
+    - name: Build with Maven Java ${{ matrix.java }} on WildFly
       run:  |
         cd wf-core-tck-runner
-        echo "JBOSS_HOME=$JBOSS_HOME"
-        mvn -B clean verify -Djboss.home=$JBOSS_HOME -fae
+        mvn -B clean verify -Dversion.org.wildfly=${{ needs.wildfly-build.outputs.wildfly-version }} -fae
     - uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: surefire-reports
-        path: '**/surefire-reports/*.txt'
+        name: test-reports-${{ matrix.java }}
+        path: |
+          '**/surefire-reports/'
+          '**/failsafe-reports/'
         
diff --git a/wf-core-tck-runner/cdi-langmodel-tck/pom.xml b/wf-core-tck-runner/cdi-langmodel-tck/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdi-langmodel-tck-runner</artifactId>

diff --git a/wf-core-tck-runner/cdi-tck/pom.xml b/wf-core-tck-runner/cdi-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdi-tck-runner</artifactId>

diff --git a/wf-core-tck-runner/core-tck/pom.xml b/wf-core-tck-runner/core-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-profile-tck-runner</artifactId>

diff --git a/wf-core-tck-runner/inject-tck/pom.xml b/wf-core-tck-runner/inject-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>inject-standalone-tck-runner</artifactId>

diff --git a/wf-core-tck-runner/jsonb-standalone-tck/pom.xml b/wf-core-tck-runner/jsonb-standalone-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsonb-standalone-tck-runner</artifactId>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.eclipse.parsson</groupId>
             <artifactId>parsson</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/wf-core-tck-runner/jsonp-standalone-tck/pom.xml b/wf-core-tck-runner/jsonp-standalone-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsonp-standalone-tck-runner</artifactId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.eclipse.parsson</groupId>
             <artifactId>parsson</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/wf-core-tck-runner/jsonp-tck/pom.xml b/wf-core-tck-runner/jsonp-tck/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.wildfly.tck</groupId>
     <artifactId>core-tck-runner-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jsonp-tck-runner</artifactId>

diff --git a/wf-core-tck-runner/pom.xml b/wf-core-tck-runner/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>org.wildfly.tck</groupId>
     <artifactId>core-tck-runner-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WildFly Jakarta Core Profile TCK Runner Parent</name>
 
@@ -85,39 +85,32 @@
         <annotations.api.version>2.1.1</annotations.api.version>
         <interceptors.api.version>2.1.0</interceptors.api.version>
         <inject.api.version>2.0.1</inject.api.version>
-        <cdi.api.version>4.0.0</cdi.api.version>
+        <cdi.api.version>4.0.1</cdi.api.version>
         <el.api.version>5.0.0</el.api.version>
-        <jsonp.api.version>2.1.0</jsonp.api.version>
+        <jsonp.api.version>2.1.2</jsonp.api.version>
+        <jsonp.tck.version>2.1.1</jsonp.tck.version>
         <jsonb.api.version>3.0.0</jsonb.api.version>
         <rest.api.version>3.1.0</rest.api.version>
         <core.profile.tck.version>10.0.1</core.profile.tck.version>
-        <cdi.tck.version>4.0.10</cdi.tck.version>
-        <cdi.tck.dist.version>4.0.10</cdi.tck.dist.version>
-        <rest.tck.version>3.1.1</rest.tck.version>
+        <cdi.tck.version>4.0.11</cdi.tck.version>
+        <cdi.tck.dist.version>4.0.11</cdi.tck.dist.version>
+        <rest.tck.version>3.1.3</rest.tck.version>
 
         <!-- Test tools/dependencies -->
-        <version.org.jboss.arquillian>1.7.0.Alpha12</version.org.jboss.arquillian>
-        <arquillian.container.se.api.version>1.0.1.Final</arquillian.container.se.api.version>
+        <version.org.jboss.arquillian>1.7.1.Final</version.org.jboss.arquillian>
         <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.7.2</jupiter.version>
-        <jupiter.platform.version>1.7.2</jupiter.platform.version>
-        <sigtest.plugin.version>1.6</sigtest.plugin.version>
+        <jupiter.version>5.10.0</jupiter.version>
+        <sigtest.plugin.version>1.7</sigtest.plugin.version>
         <signature.sigTestClasspath/>
 
-        <weld.version>5.1.0.Final</weld.version>
-        <!-- Locally build projects -->
-        <!-- https://github.com/resteasy/resteasy.git -->
-        <resteasy.version>6.2.1.Final</resteasy.version>
-        <!-- https://github.com/wildfly/wildfly-arquillian.git -->
-        <version.org.wildfly.arquillian>5.0.0.Alpha5</version.org.wildfly.arquillian>
-        <wildfly.plugin.version>3.0.2.Final</wildfly.plugin.version>
+        <weld.version>5.1.2.Final</weld.version>
+        <resteasy.version>6.2.5.Final</resteasy.version>
+        <version.org.wildfly.arquillian>5.0.1.Final</version.org.wildfly.arquillian>
+        <wildfly.plugin.version>4.2.0.Final</wildfly.plugin.version>
 
-        <version.org.wildfly>28.0.0.Beta1</version.org.wildfly>
-
-        <!-- Plugin versions -->
-        <version.org.jboss.galleon>5.0.5.Final</version.org.jboss.galleon>
+        <version.org.wildfly>30.0.0.Beta1</version.org.wildfly>
 
         <!--gc.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006</gc.args-->
         <failsafe.plugin.jdk17.args/>
@@ -151,6 +144,13 @@
     <!-- Dependency management -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>cdi-tck-api</artifactId>
@@ -220,7 +220,7 @@
             <dependency>
                 <groupId>jakarta.json</groupId>
                 <artifactId>jakarta.json-tck</artifactId>
-                <version>${jsonp.api.version}</version>
+                <version>${jsonp.tck.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -272,16 +272,6 @@
                 <artifactId>junit-jupiter-engine</artifactId>
                 <version>${jupiter.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-reporting</artifactId>
-                <version>${jupiter.platform.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-commons</artifactId>
-                <version>${jupiter.platform.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.netbeans.tools</groupId>
@@ -468,18 +458,16 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.jboss.galleon</groupId>
-                        <artifactId>galleon-maven-plugin</artifactId>
-                        <version>${version.org.jboss.galleon}</version>
+                        <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <version>${wildfly.plugin.version}</version>
                         <configuration>
                             <skip>${galleon.skip}</skip>
-                            <install-dir>${jboss.home}</install-dir>
-                            <record-state>false</record-state>
-                            <log-time>${galleon.log.time}</log-time>
+                            <provisioning-dir>${jboss.home}</provisioning-dir>
                             <offline>${galleon.offline}</offline>
-                            <plugin-options>
+                            <galleon-options>
                                 <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
-                            </plugin-options>
+                            </galleon-options>
                             <feature-packs>
                                 <feature-pack>
                                     <groupId>${feature.pack.groupId}</groupId>
@@ -489,20 +477,14 @@
                                     <inherit-packages>false</inherit-packages>
                                 </feature-pack>
                             </feature-packs>
-                            <configurations>
-                                <config>
-                                    <model>standalone</model>
-                                    <name>standalone.xml</name>
-                                    <layers>
-                                        <layer>ee-core-profile-server</layer>
-                                    </layers>
-                                </config>
-                            </configurations>
+                            <layers>
+                                <layer>ee-core-profile-server</layer>
+                            </layers>
                         </configuration>
                         <executions>
                             <execution>
                                 <id>server-provisioning</id>
-                                <phase>process-test-classes</phase>
+                                <phase>generate-test-resources</phase>
                                 <goals>
                                     <goal>provision</goal>
                                 </goals>

diff --git a/wf-core-tck-runner/rest-tck/pom.xml b/wf-core-tck-runner/rest-tck/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wildfly.tck</groupId>
         <artifactId>core-tck-runner-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>rest-tck-runner</artifactId>
@@ -26,18 +26,6 @@
         <test>ee.jakarta.tck.coreprofile.rs.CoreProfileRestTCKSuite</test>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>5.9.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.ee.tck.coreprofile</groupId>
@@ -126,7 +114,7 @@
         <dependency>
             <groupId>org.netbeans.tools</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.6</version>
+            <version>${sigtest.plugin.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- RESTEasy required dependencies -->