OpenLiberty
diff --git a/‎.github/workflows/gradle.yml‎
Lines changed: 139 additions & 123 deletions b/‎.github/workflows/gradle.yml‎
Lines changed: 139 additions & 123 deletions
diff --git a/‎README.md‎
Lines changed: 7 additions & 5 deletions b/‎README.md‎
Lines changed: 7 additions & 5 deletions
@@ -7,7 +7,7 @@ on:
   push:
     branches: '**'
   pull_request:
-    branches: [ feature/gradle9 ]
+    branches: [ main ]
 
 jobs:
   # UNIX BUILDS
@@ -18,70 +18,81 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [25.0.0.6]
-        java: [21, 17]
+        RUNTIME_VERSION: [25.0.0.12]
+        java: [21, 17, 25]
+        exclude:
+        - java: 8
+          RUNTIME: wlp
+        - java: 11
+          RUNTIME: ol
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
     steps:
-      # Checkout repos
-      - name: Checkout ci.gradle
-        uses: actions/checkout@v3
-      # Set up Java
-      - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: ${{ matrix.java }}
-          cache: 'gradle'
-      - name: Checkout ci.common
-        uses: actions/checkout@v3
-        with:
-          repository: OpenLiberty/ci.common
-          path: ci.common
-      - name: Checkout ci.ant
-        uses: actions/checkout@v3
-        with:
-          repository: OpenLiberty/ci.ant
-          path: ci.ant
-      # Cache mvn/gradle packages
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      # Install dependencies
-      - name: Install ci.ant and ci.common
-        run: |
-          mvn -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
-          mvn -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
-
-      - name: Run tests with Gradle on Ubuntu
-        run:
-          ./gradlew clean install check -P"test.exclude"="**/TestSpringBootApplication*,**/DevContainerTest*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --warning-mode=all
-      # Copy build reports and upload artifact if build failed
-      - name: Copy build/report/tests/test for upload
-        if: ${{ failure() }}
-        run: |
-          mkdir -p ${BUILD_REPORTS_PATH}
-          cp -r test ${BUILD_REPORTS_PATH}
-        working-directory: build/reports/tests
-        env:
-          BUILD_REPORTS_PATH: /buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/
-      - uses: actions/upload-artifact@v4
-        if: ${{ failure() }}
-        with:
-          name: buildReportsArtifactLinux
-          path: /buildReports
-          retention-days: 3
+    # Checkout repos
+    - name: Checkout ci.gradle
+      uses: actions/checkout@v3
+    - name: Setup Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+        cache: 'gradle'
+    - name: Checkout ci.common
+      uses: actions/checkout@v3
+      with:
+        repository: OpenLiberty/ci.common
+        path: ci.common
+    - name: Checkout ci.ant
+      uses: actions/checkout@v3
+      with:
+        repository: OpenLiberty/ci.ant
+        path: ci.ant
+    # Cache mvn/gradle packages
+    - name: Cache Maven packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Cache Gradle packages
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+    # Install dependencies
+    - name: Install ci.ant and ci.common
+      run: |
+        mvn -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
+        mvn -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
+    # Run tests that require a minimum of Java 17 or later
+    - name: Run tests that require a minimum of Java 17 or later
+      if: ${{ matrix.java == '17' || matrix.java == '21' }}
+      run:
+        ./gradlew clean install check -P"test.include"="**/TestSpringBootApplication30*,**/TestCompileJSPSource17*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --warning-mode=all
+    # Run tests
+    - name: Run tests with Gradle on Ubuntu
+      run:
+        ./gradlew clean install check -P"test.exclude"="**/TestSpringBootApplication20*,**/TestSpringBootApplication30*,**/TestCompileJSPSource17*,**/DevContainerTest*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --warning-mode=all
+    # Copy build reports and upload artifact if build failed
+    - name: Copy build/report/tests/test for upload
+      if: ${{ failure() }}
+      run: |
+        # Create the directory within the workspace
+        mkdir -p "${{ github.workspace }}/${{ env.BUILD_REPORTS_PATH }}"
+        # Copy the test results into that directory
+        cp -r test/* "${{ github.workspace }}/${{ env.BUILD_REPORTS_PATH }}"
+      working-directory: build/reports/tests
+      env:
+        BUILD_REPORTS_PATH: buildReports/${{ runner.os }}/java${{ matrix.java }}/${{ matrix.RUNTIME }}-${{ matrix.RUNTIME_VERSION }}
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: buildReportsArtifactLinux_${{matrix.java}}_${{matrix.RUNTIME}}_${{matrix.RUNTIME_VERSION}}
+        path: ${{ github.workspace }}/buildReports/
+        retention-days: 3
 
   # WINDOWS BUILDS
   build-windows:
@@ -91,66 +102,71 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [25.0.0.6]
-        java: [21, 17]
+        RUNTIME_VERSION: [25.0.0.12]
+        java: [21, 17, 25]
+        exclude:
+        - java: 8
+          RUNTIME: ol
+        - java: 11
+          RUNTIME: wlp
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
     env:
-      TEST_EXCLUDE: ${{ '**/Polling*,**/LibertyTest*,**/GenerateFeaturesTest*,**/TestSpringBootApplication*,**/DevContainerTest*' }}
+      TEST_EXCLUDE: ${{ '**/Polling*,**/LibertyTest*,**/LibertyToolchainTest*,**/GenerateFeaturesTest*,**/TestSpringBootApplication*,**/DevContainerTest*,**/DevModeToolchainTest*' }}
     steps:
-      # Checkout repos
-      - name: Checkout ci.gradle
-        uses: actions/checkout@v3
-        # Set up Java
-      - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: ${{ matrix.java }}
-          cache: 'gradle'
-      # Moving and cloning to C: drive for Windows for more disk space
-      - name: Clone ci.ant, ci.common, ci.gradle repos to C drive
-        run: |
-          echo ${{github.workspace}}
-          git clone https://github.com/OpenLiberty/ci.common.git ${{github.workspace}}/ci.common
-          git clone https://github.com/OpenLiberty/ci.ant.git ${{github.workspace}}/ci.ant
-      # Cache mvn/gradle packages
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      # Install ci.ant
-      - name: Install ci.ant
-        working-directory: ${{github.workspace}}/ci.ant
-        run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
-      # Install ci.common
-      - name: Install ci.common
-        working-directory: ${{github.workspace}}/ci.common
-        run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
-      # Run tests
-      - name: Run tests with Gradle on Windows
-        working-directory: ${{github.workspace}}
-        # LibertyTest is excluded because test0_run hangs
-        run: ./gradlew clean install check -P"test.exclude"="${{env.TEST_EXCLUDE}}" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --no-daemon
-        timeout-minutes: 75
-      # Copy build reports and upload artifact if build failed
-      - name: Copy build/report/tests/test for upload
-        if: ${{ failure() }}
-        working-directory: ${{github.workspace}}
-        run: cp -r build/reports/tests/test C:/buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/
-      - uses: actions/upload-artifact@v4
-        if: ${{ failure() }}
-        with:
-          name: buildReportsArtifactWindows
-          path: C:/buildReports
-          retention-days: 3
+    # Checkout repos
+    - name: Checkout ci.gradle
+      uses: actions/checkout@v3
+      # Set up Java
+    - name: Setup Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+        cache: 'gradle'
+    # Moving and cloning to C: drive for Windows for more disk space
+    - name: Clone ci.ant, ci.common, ci.gradle repos to C drive
+      run: |
+        echo ${{github.workspace}}
+        git clone https://github.com/OpenLiberty/ci.common.git ${{github.workspace}}/ci.common
+        git clone https://github.com/OpenLiberty/ci.ant.git ${{github.workspace}}/ci.ant
+    # Cache mvn/gradle packages
+    - name: Cache Maven packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Cache Gradle packages
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+    # Install ci.ant
+    - name: Install ci.ant
+      working-directory: ${{github.workspace}}/ci.ant
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
+    # Install ci.common
+    - name: Install ci.common
+      working-directory: ${{github.workspace}}/ci.common
+      run: mvn -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
+    # Run tests
+    - name: Run tests with Gradle on Windows
+      working-directory: ${{github.workspace}}
+      # LibertyTest is excluded because test0_run hangs
+      run: ./gradlew clean install check -P"test.exclude"="${{env.TEST_EXCLUDE}}" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --no-daemon
+      timeout-minutes: 75
+    # Copy build reports and upload artifact if build failed
+    - name: Copy build/report/tests/test for upload
+      if: ${{ failure() }}
+      working-directory: ${{github.workspace}}
+      run: cp -r build/reports/tests/test C:/buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: buildReportsArtifactWindows_${{matrix.java}}_${{matrix.RUNTIME}}_${{matrix.RUNTIME_VERSION}}
+        path: C:/buildReports
+        retention-days: 3
@@ -4,6 +4,7 @@ The Liberty Gradle plugin supports install and operational control of Liberty ru
 
 * [Build](#build)
 * [Usage](#usage)
+  * [Compatibility / Support](#compatibility--support)
 * [Plugin Configuration](#plugin-configuration)
 * [Tasks](#tasks)
 * [Extensions](#extensions)
@@ -35,15 +36,16 @@ To run DevContainerTests locally, you must have either Podman or Docker set up a
 
 ## Usage
 
-### Gradle Support
+### Compatibility / Support
 
-The Liberty Gradle Plugin supports running with Gradle 7.6+ and Gradle 8.x as of release 3.7. When using a Gradle wrapper, ensure the wrapper version matches the version of Gradle being used.
+For the full Java and Gradle version compatibility matrix, see the [Gradle Compatibility Matrix](https://docs.gradle.org/current/userguide/compatibility.html).
 
-### Java Support
+- **Gradle 9.x** requires Java 17 or later and plugin version **3.9.4** or later.
+- **Gradle 7.6 / 8.x** works with Java 8, 11, 17, or 21 and plugin version **3.8.2** or later.
 
-The Liberty Gradle Plugin is tested with Long-Term-Support (LTS) releases of Java. The plugin, as of release 3.8, supports Java 8, 11, 17 and 21. Versions 3.5 to 3.7.x support Java 8, 11 and 17. Prior to version 3.5, the plugin is supported on Java 8 and 11.
+The Liberty Gradle Plugin is tested with Long-Term-Support (LTS) releases of Java. The plugin, as of release 3.8, supports Java 8, 11, 17 and 21. As of release 4.0.0, we support Java 25 as well. Versions 3.5 to 3.7.x support Java 8, 11 and 17. Prior to version 3.5, the plugin is supported on Java 8 and 11. For running applications on older versions of Java, please check out our toolchain support.
 
-Note: To use the Liberty Gradle Plugin with Java 21, a minimum of Gradle 8.4 is required. Since Gradle does not officially support Java 21 yet, there may be unknown issues. All of our automated tests are passing with Gradle 8.4 though.
+For Liberty Gradle Plugin-specific compatibility details, known limitations, and migration guidance, see the [Detailed Compatibility Matrix](docs/Gradle9MigrationGuide.md#detailed-compatibility-matrix) in the Migration Guide.
 
 ### Adding the plugin to the build script