Update CI to run tests on different versions within the same containe…

.github/workflows/ci.yml

@@ -16,6 +16,9 @@ concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
+env:
+  MVN_CMD: './mvnw -V -B'
+
 jobs:
   format-check:
     runs-on: ubuntu-latest
@@ -31,43 +34,45 @@ jobs:
           cache: 'maven'
       - name: Validate Formatting
         run: |
-          mvn -B validate -Pformat-check -Denforcer.skip=true
+          ${{ env.MVN_CMD }} validate -Pformat-check -Denforcer.skip=true
 
   build:
-    name: '${{ matrix.os }}-jdk${{ matrix.java }}'
+    name: '${{ matrix.os }}'
     needs: format-check
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' , 'windows-latest',  'macos-latest' ]
-        java: ['17', '21', '25']
 
     steps:
       - uses: actions/checkout@v6
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDKs
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.java }}
           cache: 'maven'
           distribution: 'temurin'
-      - name: Build and Test on ${{ matrix.os }} - ${{ matrix.java }}
-        run: mvn clean install
-      - name: Upload surefire logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/'
-      - name: Upload failsafe logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/failsafe-reports/'
-      - name: Upload logs for failed run
+          # Please note the order here of having 25 last as that is the version we want to compile with
+          java-version: |
+            17
+            21
+            26
+            25
+      - name: Build and Test on ${{ matrix.os }} - Java 25
+        run: ${{ env.MVN_CMD }} clean verify
+      - name: Build and Test on ${{ matrix.os }} - Java 26
+        run: ${{ env.MVN_CMD }} verify '-Dtest.java.home=${{env.JAVA_HOME_26_X64}}${{env.JAVA_HOME_26_ARM64}}' '-Dtest.report.dir=java26'
+      - name: Build and Test on ${{ matrix.os }} - Java 21
+        run: ${{ env.MVN_CMD }} verify '-Dtest.java.home=${{env.JAVA_HOME_21_X64}}${{env.JAVA_HOME_21_ARM64}}' '-Dtest.report.dir=java21'
+      - name: Build and Test on ${{ matrix.os }} - Java 17
+        run: ${{ env.MVN_CMD }} verify '-Dtest.java.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}' '-Dtest.report.dir=java17'
+      - name: Upload test logs for failed run
         uses: actions/upload-artifact@v7
         if: failure()
         with:
-          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/*.log'
+          name: test-reports-${{ matrix.os }}
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/

.github/workflows/deploy-javadocs.yml

@@ -31,10 +31,10 @@ jobs:
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v6
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           cache: 'maven'
           distribution: 'temurin'
       - name: Generate JavaDoc

.github/workflows/integration-tests.yml

@@ -28,6 +28,9 @@ concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
+env:
+  MVN_CMD: 'mvn -V -B'
+
 jobs:
 
   arquillian-test:
@@ -42,8 +45,6 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: |
-            17
-            21
             25
           distribution: 'temurin'
           architecture: x64
@@ -52,18 +53,29 @@ jobs:
       - name: Install SNAPSHOT
         run: |
           cd wildfly-plugin-tools
-          mvn -B -ntp install -DskipTests
+          ${{ env.MVN_CMD }} install -DskipTests
       - name: Check out WildFly Arquillian
         uses: actions/checkout@v6
         with:
           repository: wildfly/wildfly-arquillian
           path: wildfly-arquillian
-      - name: Test WildFly Arquillian
+        # The first run needs to use install as the SNAPSHOT dependencies are required for testing
+      - name: Test WildFly Arquillian Java 25
         run: |
           cd wildfly-arquillian
-          mvn versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
+          ${{ env.MVN_CMD }} versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
           git diff
-          mvn -B -ntp install -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
+          ${{ env.MVN_CMD }} clean install
+      - name: Upload test logs for failed run
+        uses: actions/upload-artifact@v7
+        if: failure()
+        with:
+          name: wildfly-arquillian-reports
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/
 
   maven-plugin-test:
     name: WildFly Maven Plugin Integration Test
@@ -77,8 +89,6 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: |
-            17
-            21
             25
           distribution: 'temurin'
           architecture: x64
@@ -87,18 +97,29 @@ jobs:
       - name: Install SNAPSHOT
         run: |
           cd wildfly-plugin-tools
-          mvn -B -ntp install -DskipTests
+          ${{ env.MVN_CMD }} install -DskipTests
       - name: Check out WildFly Maven Plugin
         uses: actions/checkout@v6
         with:
           repository: wildfly/wildfly-maven-plugin
           path: wildfly-maven-plugin
-      - name: Test the WildFly Maven Plugin
+        # The first run needs to use install as the SNAPSHOT dependencies are required for testing
+      - name: Test the WildFly Maven Plugin Java 25
         run: |
           cd wildfly-maven-plugin
-          mvn versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
+          ${{ env.MVN_CMD }} versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
           git diff
-          mvn -B -ntp install -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
+          ${{ env.MVN_CMD }} clean install
+      - name: Upload test logs for failed run
+        uses: actions/upload-artifact@v7
+        if: failure()
+        with:
+          name: wildfly-maven-plugin-reports
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/
 
   wildfly-glow-test:
     name: WildFly Glow Integration Test
@@ -112,8 +133,6 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: |
-            17
-            21
             25
           distribution: 'temurin'
           architecture: x64
@@ -122,15 +141,26 @@ jobs:
       - name: Install SNAPSHOT
         run: |
           cd wildfly-plugin-tools
-          mvn -B -ntp install -DskipTests
+          ${{ env.MVN_CMD }} install -DskipTests
       - name: Check out WildFly Glow
         uses: actions/checkout@v6
         with:
           repository: wildfly/wildfly-glow
           path: wildfly-glow
-      - name: Test the WildFly Glow
+      - name: Test the WildFly Glow Java 25
+        # The first run needs to use install as the SNAPSHOT dependencies are required for testing
         run: |
           cd wildfly-glow
-          mvn versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
+          ${{ env.MVN_CMD }} versions:use-latest-snapshots -DallowSnapshots -Dincludes=org.wildfly.plugins:wildfly-plugin-tools versions:update-properties
           git diff
-          mvn -B -ntp install -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
+          ${{ env.MVN_CMD }} clean install
+      - name: Upload test logs for failed run
+        uses: actions/upload-artifact@v7
+        if: failure()
+        with:
+          name: wildfly-glow-reports
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/

.github/workflows/wildfly-ci.yml

@@ -20,83 +20,79 @@ concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
+env:
+  MVN_CMD: './mvnw -V -B'
+
 jobs:
 
   wildfly-test-and-build:
-    name: '${{ matrix.os }}-jdk${{ matrix.java }}'
+    name: '${{ matrix.os }}'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' , 'windows-latest' ]
-        java: ['17', '21', '25']
 
     steps:
       - uses: actions/checkout@v6
       - uses: wildfly-extras/wildfly-nightly-download@v1
         id: wildfly-nightly
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDKs
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.java }}
           cache: 'maven'
           distribution: 'temurin'
-      - name: Build and Test on ${{ matrix.os }} - ${{ matrix.java }} with WildFly ${{steps.wildfly-nightly.outputs.wildfly-version}}
-        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{steps.wildfly-nightly.outputs.wildfly-version}}'
-      - name: Upload surefire logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/'
-      - name: Upload failsafe logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/failsafe-reports/'
-      - name: Upload logs for failed run
+          # Please note the order here of having 25 last as that is the version we want to compile with
+          java-version: |
+            17
+            21
+            26
+            25
+      - name: Build and Test on ${{ matrix.os }} Java 25 with WildFly ${{steps.wildfly-nightly.outputs.wildfly-version}}
+        run: ${{ env.MVN_CMD }} clean verify '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{steps.wildfly-nightly.outputs.wildfly-version}}'
+      - name: Build and Test on ${{ matrix.os }} Java 26 with WildFly ${{steps.wildfly-nightly.outputs.wildfly-version}}
+        run: ${{ env.MVN_CMD }} verify '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{steps.wildfly-nightly.outputs.wildfly-version}}' '-Dtest.java.home=${{env.JAVA_HOME_26_X64}}${{env.JAVA_HOME_26_ARM64}}' '-Dtest.report.dir=java26'
+      - name: Build and Test on ${{ matrix.os }} Java 21 with WildFly ${{steps.wildfly-nightly.outputs.wildfly-version}}
+        run: ${{ env.MVN_CMD }} verify '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{steps.wildfly-nightly.outputs.wildfly-version}}' '-Dtest.java.home=${{env.JAVA_HOME_21_X64}}${{env.JAVA_HOME_21_ARM64}}' '-Dtest.report.dir=java21'
+      - name: Build and Test on ${{ matrix.os }} Java 17 with WildFly ${{steps.wildfly-nightly.outputs.wildfly-version}}
+        run: ${{ env.MVN_CMD }} verify '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{steps.wildfly-nightly.outputs.wildfly-version}}' '-Dtest.java.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}' '-Dtest.report.dir=java17'
+      - name: Upload test logs for failed run
         uses: actions/upload-artifact@v7
         if: failure()
         with:
-          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/*.log'
+          name: wildfly-build-test-reports-${{ matrix.os }}
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/
 
   legacy-test-and-build:
-    name: 'legacy-${{ matrix.os }}-jdk${{ matrix.java }}'
+    name: 'legacy-${{ matrix.os }}'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' , 'windows-latest' ]
-        java: ['17', '21']
 
     steps:
       - uses: actions/checkout@v6
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           cache: 'maven'
           distribution: 'temurin'
-      - name: Build and Test on ${{ matrix.os }} - ${{ matrix.java }} with WildFly 32.0.0.Final
+      - name: Build and Test on ${{ matrix.os }} - Java 21 with WildFly 32.0.0.Final
         # 32.0.0.Final was the first version which deployed channels
-        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=32.0.0.Final'
-      - name: Upload surefire logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: legacy-surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/'
-      - name: Upload failsafe logs for failed run
-        uses: actions/upload-artifact@v7
-        if: failure()
-        with:
-          name: legacy-failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/failsafe-reports/'
-      - name: Upload logs for failed run
+        run: ${{ env.MVN_CMD }} clean verify '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=32.0.0.Final'
+      - name: Upload test logs for failed run
         uses: actions/upload-artifact@v7
         if: failure()
         with:
-          name: legacy-server-logs-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/*.log'
+          name: wildfly-legacy-build-test-reports-${{ matrix.os }}
+          path: |
+            **/logs/
+            **/*.log
+            **/failsafe-reports/
+            **/surefire-reports/

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip