Merge remote-tracking branch 'spring-projects/main' into fix/42273_spring-log4j-runtime-hints

Author: ppkarwasz

.github/actions/create-github-release/action.yml

@@ -1,6 +1,9 @@
 name: Create GitHub Release
 description: 'Create the release on GitHub with a changelog'
 inputs:
+  commercial:
+    description: 'Whether to generate the changelog for the commercial release'
+    required: true
   milestone:
     description: 'Name of the GitHub milestone for which a release will be created'
     required: true
@@ -11,9 +14,6 @@ inputs:
   token:
     description: 'Token to use for authentication with GitHub'
     required: true
-  commercial:
-    description: 'Whether to generate the changelog for the commercial release'
-    required: true
 runs:
   using: composite
   steps:

.github/actions/prepare-gradle-build/action.yml

@@ -34,20 +34,20 @@ runs:
         tool-cache: true
         docker-images: false
     - name: Set Up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
         java-version: |
           ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '24' || '' }}
     - name: Set Up Gradle With Read/Write Cache
       if: ${{ inputs.cache-read-only == 'false' }}
-      uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+      uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
       with:
         develocity-access-key: ${{ inputs.develocity-access-key }}
         develocity-token-expiry: 4

.github/actions/publish-gradle-plugin/action.yml

@@ -21,14 +21,14 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@ff5cb544114ffc152db9cea1cd3d5978d5074946 # v4.5.11
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Artifacts
       shell: bash
       run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-boot-{0}', inputs.plugin-version) }};buildNumber=${{ inputs.build-number }}'
     - name: Set Up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'liberica'
         java-version: '17'

.github/actions/sync-to-maven-central/action.yml

@@ -1,17 +1,14 @@
 name: Sync to Maven Central
 description: 'Syncs a release to Maven Central and waits for it to be available for use'
 inputs:
-  jfrog-cli-config-token:
-    description: 'Config token for the JFrog CLI'
-    required: true
-  ossrh-s01-staging-profile:
-    description: 'Staging profile to use when syncing to Central'
+  central-token-password:
+    description: 'Password for authentication with central.sonatype.com'
     required: true
-  ossrh-s01-token-password:
-    description: 'Password for authentication with s01.oss.sonatype.org'
+  central-token-username:
+    description: 'Username for authentication with central.sonatype.com'
     required: true
-  ossrh-s01-token-username:
-    description: 'Username for authentication with s01.oss.sonatype.org'
+  jfrog-cli-config-token:
+    description: 'Config token for the JFrog CLI'
     required: true
   spring-boot-version:
     description: 'Version of Spring Boot that is being synced to Central'
@@ -20,23 +17,17 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@ff5cb544114ffc152db9cea1cd3d5978d5074946 # v4.5.11
+      uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Release Artifacts
       shell: bash
       run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-boot-{0}', inputs.spring-boot-version) }};buildNumber=${{ github.run_number }}'
     - name: Sync
-      uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
+      uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
       with:
-        close: true
-        create: true
-        generate-checksums: true
-        password: ${{ inputs.ossrh-s01-token-password }}
-        release: true
-        staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
-        upload: true
-        username: ${{ inputs.ossrh-s01-token-username }}
+        token: ${{ inputs.central-token-password }}
+        token-name: ${{ inputs.central-token-username }}
     - name: Await
       uses: ./.github/actions/await-http-resource
       with:

.github/actions/update-homebrew-tap/action.yml

@@ -11,7 +11,7 @@ runs:
   using: composite
   steps:
     - name: Check Out Homebrew Tap Repo
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@v5
       with:
         path: updated-homebrew-tap-repo
         repository: spring-io/homebrew-tap

.github/dependabot.yml

@@ -6,3 +6,11 @@ updates:
       interval: "weekly"
     labels:
       - "type: task"
+      - "status: waiting-for-triage"
+  - package-ecosystem: "npm"
+    directory: "/antora"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "type: task"
+      - "status: waiting-for-triage"

.github/workflows/build-and-deploy-snapshot.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build and Publish
         id: build-and-publish
         uses: ./.github/actions/build
@@ -44,7 +44,7 @@ jobs:
         uses: ./.github/actions/send-notification
         with:
           build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
-          run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
+          run-name: ${{ format('{0} | Linux | Java 24', github.ref_name) }}
           status: ${{ job.status }}
           webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
     outputs:

.github/workflows/build-pull-request.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build
         id: build
         uses: ./.github/actions/build

.github/workflows/ci.yml

@@ -25,6 +25,8 @@ jobs:
             toolchain: true
           - version: 24
             toolchain: false
+          - version: 25
+            toolchain: true
         exclude:
           - os:
               name: Linux
@@ -40,7 +42,7 @@ jobs:
           git config --global core.longPaths true
           Stop-Service -name Docker
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build
         id: build
         uses: ./.github/actions/build

.github/workflows/release-milestone.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     steps:
       - name: Check Out Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Build and Publish
         id: build-and-publish
         uses: ./.github/actions/build
         with:
-          develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           gradle-cache-read-only: false
           publish: true
       - name: Stage Release
@@ -50,24 +50,58 @@ jobs:
     with:
       staging: true
       version: ${{ needs.build-and-stage-release.outputs.version }}
+  sync-to-maven-central:
+    name: Sync to Maven Central
+    if: ${{ !vars.COMMERCIAL }}
+    needs:
+      - build-and-stage-release
+      - verify
+    runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
+    steps:
+      - name: Check Out Code
+        uses: actions/checkout@v5
+      - name: Sync to Maven Central
+        uses: ./.github/actions/sync-to-maven-central
+        with:
+          central-token-password: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
+          central-token-username: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          spring-boot-version: ${{ needs.build-and-stage-release.outputs.version }}
   promote-release:
     name: Promote Release
     needs:
       - build-and-stage-release
-      - verify
+      - sync-to-maven-central
     runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
     steps:
       - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@ff5cb544114ffc152db9cea1cd3d5978d5074946 # v4.5.11
+        uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Promote build
         run: jfrog rt build-promote ${{ format('spring-boot-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} libs-milestone-local
+  publish-gradle-plugin:
+    name: Publish Gradle Plugin
+    if: ${{ !vars.COMMERCIAL }}
+    needs:
+      - build-and-stage-release
+      - sync-to-maven-central
+    runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
+    steps:
+      - name: Check Out Code
+        uses: actions/checkout@v5
+      - name: Publish
+        uses: ./.github/actions/publish-gradle-plugin
+        with:
+          gradle-plugin-publish-key: ${{ secrets.GRADLE_PLUGIN_PUBLISH_KEY }}
+          gradle-plugin-publish-secret: ${{ secrets.GRADLE_PLUGIN_PUBLISH_SECRET }}
+          jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+          plugin-version: ${{ needs.build-and-stage-release.outputs.version }}
   trigger-docs-build:
     name: Trigger Docs Build
     needs:
       - build-and-stage-release
-      - verify
+      - sync-to-maven-central
     permissions:
       actions: write
     runs-on: ubuntu-latest
@@ -81,14 +115,16 @@ jobs:
     needs:
       - build-and-stage-release
       - promote-release
+      - publish-gradle-plugin
       - trigger-docs-build
     runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
     steps:
       - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v5
       - name: Create GitHub Release
         uses: ./.github/actions/create-github-release
         with:
+          commercial: ${{ vars.COMMERCIAL }}
           milestone: ${{ needs.build-and-stage-release.outputs.version }}
           pre-release: true
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}