Add a property for configuring additional livereload paths #40342

.github/actions/build/action.yml

@@ -5,13 +5,17 @@ inputs:
     required: false
     default: '17'
     description: 'The Java version to compile and test with'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The Java distribution to use for the build'
   java-toolchain:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether a Java toolchain should be used'
   publish:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
   develocity-access-key:
     required: false
@@ -29,21 +33,19 @@ runs:
     - name: Prepare Gradle Build
       uses: ./.github/actions/prepare-gradle-build
       with:
+        develocity-access-key: ${{ inputs.develocity-access-key }}
         java-version: ${{ inputs.java-version }}
+        java-distribution: ${{ inputs.java-distribution }}
         java-toolchain: ${{ inputs.java-toolchain }}
     - name: Build
       id: build
       if: ${{ inputs.publish == 'false' }}
       shell: bash
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
       run: ./gradlew build
     - name: Publish
       id: publish
       if: ${{ inputs.publish == 'true' }}
       shell: bash
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
       run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository ${{ !startsWith(github.event.head_commit.message, 'Next development version') && 'build' || '' }} publishAllPublicationsToDeploymentRepository
     - name: Read Version From gradle.properties
       id: read-version

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

@@ -7,11 +7,15 @@ inputs:
   token:
     description: Token to use for authentication with GitHub
     required: true
+  pre-release:
+    description: Whether the release is a pre-release (a milestone or release candidate)
+    required: false
+    default: 'false'
 runs:
   using: composite
   steps:
     - name: Generate Changelog
-      uses: spring-io/github-changelog-generator@052892c62af51f8af87a9da6de55e70864b7df12
+      uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
       with:
         milestone: ${{ inputs.milestone }}
         token: ${{ inputs.token }}
@@ -20,4 +24,4 @@ runs:
       env:
         GITHUB_TOKEN: ${{ inputs.token }}
       shell: bash
-      run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md
+      run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md ${{ inputs.pre-release == 'true' && '--prerelease' || '' }}

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

@@ -5,10 +5,17 @@ inputs:
     required: false
     default: '17'
     description: 'The Java version to use for the build'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The Java distribution to use for the build'
   java-toolchain:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether a Java toolchain should be used'
+  develocity-access-key:
+    required: false
+    description: 'The access key for authentication with ge.spring.io'
 runs:
   using: composite
   steps:
@@ -20,14 +27,15 @@ runs:
     - name: Set Up Java
       uses: actions/setup-java@v4
       with:
-        distribution: 'liberica'
+        distribution: ${{ inputs.java-distribution }}
         java-version: |
           ${{ inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
+      uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       with:
         cache-read-only: false
+        develocity-access-key: ${{ inputs.develocity-access-key }}
     - name: Configure Gradle Properties
       shell: bash
       run: |

.github/actions/print-jvm-thread-dumps/action.yml

@@ -7,7 +7,7 @@ runs:
       shell: bash
       run: |
         for jvm_pid in $(jps -q -J-XX:+PerfDisableSharedMem); do
-          jcmd $java_pid Thread.print
+          jcmd $jvm_pid Thread.print
         done
     - if: ${{ runner.os == 'Windows' }}
       shell: powershell

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

@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@727b480bafd0d8adbdfdb2257a7d7c2e08eb1779 # v4.0.2
+      uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Artifacts

.github/actions/publish-to-sdkman/action.yml

@@ -29,7 +29,7 @@ runs:
     - shell: bash
       if: ${{ inputs.make-default == 'true' }}
       run: >
-        curl -X POST \
+        curl -X PUT \
           -H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
           -H "Consumer-Token: ${{ inputs.sdkman-consumer-token }}" \
           -H "Content-Type: application/json" \

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

@@ -20,7 +20,7 @@ runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@727b480bafd0d8adbdfdb2257a7d7c2e08eb1779 # v4.0.2
+      uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Release Artifacts

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

@@ -0,0 +1,32 @@
+name: Update Homebrew Tap
+description: Updates the Homebrew Tap for the Spring Boot CLI
+inputs:
+  spring-boot-version:
+    description: 'The version to publish'
+    required: true
+  token:
+    description: 'Token to use for GitHub authentication'
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Check Out Homebrew Tap Repo
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        path: updated-homebrew-tap-repo
+        repository: spring-io/homebrew-tap
+        token: ${{ inputs.token }}
+    - name: Update Homebrew Tap
+      shell: bash
+      run: |
+        pushd updated-homebrew-tap-repo > /dev/null
+        curl https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/${{ inputs.spring-boot-version }}/spring-boot-cli-${{ inputs.spring-boot-version }}-homebrew.rb --output spring-boot-cli-${{ inputs.spring-boot-version }}-homebrew.rb
+        rm spring-boot.rb
+        mv spring-boot-cli-*.rb spring-boot.rb
+        git config user.name "Spring Builds" > /dev/null
+        git config user.email "[email protected]" > /dev/null
+        git add spring-boot.rb > /dev/null
+        git commit -m "Upgrade to Spring Boot ${{ inputs.spring-boot-version }}" > /dev/null
+        git push
+        echo "DONE"
+        popd > /dev/null

.github/dependabot.yml

@@ -4,3 +4,5 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    labels:
+      - "type: task"

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

@@ -2,7 +2,7 @@ name: Build and Deploy Snapshot
 on:
   push:
     branches:
-      - 3.1.x
+      - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -25,13 +25,11 @@ jobs:
           uri: 'https://repo.spring.io'
           username: ${{ secrets.ARTIFACTORY_USERNAME }}
           password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('spring-boot-{0}', github.ref_name)}}
+          build-name: 'spring-boot-3.4.x'
           repository: 'libs-snapshot-local'
           folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
           signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          artifact-properties: |
-            /**/spring-boot-docs-*.zip::zip.type=docs,zip.deployed=false
       - name: Send Notification
         uses: ./.github/actions/send-notification
         if: always()
@@ -42,6 +40,17 @@ jobs:
           run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
     outputs:
       version: ${{ steps.build-and-publish.outputs.version }}
+  trigger-docs-build:
+    name: Trigger Docs Build
+    runs-on: ubuntu-latest
+    needs: build-and-deploy-snapshot
+    permissions:
+      actions: write
+    steps:
+      - name: Run Deploy Docs Workflow
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh workflow run deploy-docs.yml --repo spring-projects/spring-boot -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
   verify:
     name: Verify
     needs: build-and-deploy-snapshot

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

@@ -23,9 +23,9 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 #v3.3.2
+        uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
       - name: Build
         env:
           CI: 'true'

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - 3.1.x
+      - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -22,6 +22,8 @@ jobs:
             toolchain: false
           - version: 21
             toolchain: true
+          - version: 22
+            toolchain: true
         exclude:
           - os:
               name: Linux
@@ -41,6 +43,7 @@ jobs:
         uses: ./.github/actions/build
         with:
           java-version: ${{ matrix.java.version }}
+          java-distribution: ${{ matrix.java.distribution || 'liberica' }}
           java-toolchain: ${{ matrix.java.toolchain }}
           develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       - name: Send Notification

.github/workflows/release-milestone.yml

@@ -0,0 +1,75 @@
+name: Release Milestone
+on:
+  push:
+    tags:
+      - v3.4.0-M[0-9]
+      - v3.4.0-RC[0-9]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+jobs:
+  build-and-stage-release:
+    name: Build and Stage Release
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'spring-projects/spring-boot' }}
+    steps:
+      - name: Check Out Code
+        uses: actions/checkout@v4
+      - name: Build and Publish
+        id: build-and-publish
+        uses: ./.github/actions/build
+        with:
+          develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+          publish: true
+      - name: Stage Release
+        uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
+        with:
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
+          repository: 'libs-staging-local'
+          folder: 'deployment-repository'
+          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+    outputs:
+      version: ${{ steps.build-and-publish.outputs.version }}
+  verify:
+    name: Verify
+    needs: build-and-stage-release
+    uses: ./.github/workflows/verify.yml
+    with:
+      staging: true
+      version: ${{ needs.build-and-stage-release.outputs.version }}
+    secrets:
+      google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
+      repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}
+      token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+  promote-release:
+    name: Promote Release
+    needs:
+      - build-and-stage-release
+      - verify
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JFrog CLI
+        uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
+        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
+  create-github-release:
+    name: Create GitHub Release
+    needs:
+      - build-and-stage-release
+      - promote-release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Create GitHub Release
+        uses: ./.github/actions/create-github-release
+        with:
+          milestone: ${{ needs.build-and-stage-release.outputs.version }}
+          token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+          pre-release: true