diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml index 4bf031e894..9779a4e414 100644 --- a/.github/workflows/central-sync.yml +++ b/.github/workflows/central-sync.yml @@ -14,18 +14,23 @@ jobs: central-sync: runs-on: ubuntu-latest steps: + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - name: Checkout repository uses: actions/checkout@v5 with: ref: v${{ github.event.inputs.release_version }} - - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/wrapper-validation@v5 - name: Set up JDK uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: | - 17 21 + 25 - name: Publish to Sonatype OSSRH env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.github/workflows/graalvm-dev.yml b/.github/workflows/graalvm-dev.yml index f73c5ef1d5..da29bc9ca8 100644 --- a/.github/workflows/graalvm-dev.yml +++ b/.github/workflows/graalvm-dev.yml @@ -42,6 +42,11 @@ jobs: DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} steps: + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - uses: actions/checkout@v5 - name: Pre-Build Steps uses: micronaut-projects/github-actions/graalvm/pre-build@master diff --git a/.github/workflows/graalvm-latest.yml b/.github/workflows/graalvm-latest.yml index 452d2f06dc..9fe6055419 100644 --- a/.github/workflows/graalvm-latest.yml +++ b/.github/workflows/graalvm-latest.yml @@ -8,11 +8,11 @@ on: push: branches: - master - - '[1-9]+.[0-9]+.x' + - '[0-9]+.[0-9]+.x' pull_request: branches: - master - - '[1-9]+.[0-9]+.x' + - '[0-9]+.[0-9]+.x' jobs: build_matrix: if: github.repository != 'micronaut-projects/micronaut-project-template' @@ -28,6 +28,8 @@ jobs: - name: Build Matrix uses: micronaut-projects/github-actions/graalvm/build-matrix@master id: build-matrix + with: + java-version: '21' build: needs: build_matrix if: github.repository != 'micronaut-projects/micronaut-project-template' @@ -35,19 +37,25 @@ jobs: strategy: max-parallel: 6 matrix: - java: ['17', '21'] + java: ['21'] native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }} env: DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} steps: + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - uses: actions/checkout@v5 - name: Pre-Build Steps uses: micronaut-projects/github-actions/graalvm/pre-build@master id: pre-build with: distribution: 'graalvm' + gradle-java: '21' java: ${{ matrix.java }} - name: Build Steps uses: micronaut-projects/github-actions/graalvm/build@master diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 39c25ea5b9..a412a3a28e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,18 +8,18 @@ on: push: branches: - master - - '[1-9]+.[0-9]+.x' + - '[0-9]+.[0-9]+.x' pull_request: branches: - master - - '[1-9]+.[0-9]+.x' + - '[0-9]+.[0-9]+.x' jobs: build: if: github.repository != 'micronaut-projects/micronaut-project-template' runs-on: ubuntu-latest strategy: matrix: - java: ['17', '21'] + java: ['21', '25'] env: DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} @@ -34,6 +34,11 @@ jobs: OSS_INDEX_PASSWORD: ${{ secrets.OSS_INDEX_PASSWORD }} steps: # https://github.com/actions/virtual-environments/issues/709 + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - name: "🗑 Free disk space" run: | sudo rm -rf "/usr/local/share/boost" @@ -54,14 +59,14 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🔧 Setup Gradle" - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 - name: "❓ Optional setup step" run: | [ -f ./setup.sh ] && ./setup.sh || [ ! -f ./setup.sh ] - name: "🚔 Sonatype Scan" - if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '17' + if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '21' id: sonatypescan run: | ./gradlew ossIndexAudit --no-parallel --info @@ -69,10 +74,10 @@ jobs: - name: "🛠 Build with Gradle" id: gradle run: | - ./gradlew jacocoReport check --no-daemon --continue + ./gradlew check jacocoReport --no-daemon --continue - name: "🔎 Run static analysis" - if: env.SONAR_TOKEN != '' && matrix.java == '17' + if: env.SONAR_TOKEN != '' && matrix.java == '21' run: | ./gradlew sonar --no-parallel --continue @@ -85,14 +90,14 @@ jobs: check_retries: 'true' - name: "📜 Upload binary compatibility check results" - if: matrix.java == '17' - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + if: matrix.java == '21' + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: binary-compatibility-reports path: "**/build/reports/binary-compatibility-*.html" - name: "📦 Publish to Sonatype Snapshots" - if: success() && github.event_name == 'push' && matrix.java == '17' + if: success() && github.event_name == 'push' && matrix.java == '21' env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} @@ -107,7 +112,7 @@ jobs: if_false: ${{ github.repository }} - name: "📑 Publish to Github Pages" - if: success() && github.event_name == 'push' && matrix.java == '17' + if: success() && github.event_name == 'push' && matrix.java == '21' uses: micronaut-projects/github-pages-deploy-action@master env: TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }} diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index b521c01601..6c33fedaea 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -10,6 +10,11 @@ jobs: if: github.repository != 'micronaut-projects/micronaut-project-template' runs-on: ubuntu-latest steps: + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - uses: actions/checkout@v5 - uses: actions/cache@v4 with: @@ -22,8 +27,8 @@ jobs: with: distribution: 'temurin' java-version: | - 17 21 + 25 - name: Publish to Sonatype Snapshots if: success() env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3606b1fda6..8423dc2ecd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,18 +13,23 @@ jobs: artifacts-sha256: ${{ steps.hash.outputs.artifacts-sha256 }} # Computed hashes for build artifacts. runs-on: ubuntu-latest steps: + - name: Remove system JDKs + run: | + sudo rm -rf /usr/lib/jvm/* + unset JAVA_HOME + export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:) - name: Checkout repository uses: actions/checkout@v5 with: token: ${{ secrets.GH_TOKEN }} - - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/wrapper-validation@v5 - name: Set up JDK uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: | - 17 21 + 25 - name: Set the current release version id: release_version run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT @@ -68,13 +73,13 @@ jobs: # Store the hash in a file, which is uploaded as a workflow artifact. sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256 - name: Upload build artifacts - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: gradle-build-outputs path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/* retention-days: 5 - name: Upload artifacts-sha256 - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: artifacts-sha256 path: artifacts-sha256 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..8bdaf60c75 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476..2e1113280e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9367..adff685a03 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac207..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell