Merge remote-tracking branch 'upstream/main'

Author: desiderantes

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Support
+    url: https://stackoverflow.com/tags/spring
+    about: Please ask and answer questions on StackOverflow with the tag `spring`.
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,23 @@
+---
+name: General
+about: Bugs, enhancements, documentation, tasks.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you considered asking for help on stackoverflow.com?
+
+** Bug Reports **
+Please submit issues against OSS supported versions, see https://spring.io/projects/spring-framework#support
+Please provide a minimal sample application that reproduces the problem for faster issue triage.
+
+** Enhancements requests **
+Before explaining how you would like things to work,
+please describe a concrete use case for this feature and how you have tried to solve this so far.
+
+-->
+

.github/ISSUE_TEMPLATE/issue.md

@@ -1,8 +1,8 @@
 name: Await HTTP Resource
-description: Waits for an HTTP resource to be available (a HEAD request succeeds)
+description: 'Waits for an HTTP resource to be available (a HEAD request succeeds)'
 inputs:
   url:
-    description: 'The URL of the resource to await'
+    description: 'URL of the resource to await'
     required: true
 runs:
   using: composite

.github/actions/await-http-resource/action.yml

@@ -1,31 +1,35 @@
 name: 'Build'
 description: 'Builds the project, optionally publishing it to a local deployment repository'
 inputs:
-  java-version:
+  develocity-access-key:
+    description: 'Access key for authentication with ge.spring.io'
     required: false
-    default: '17'
-    description: 'The Java version to compile and test with'
-  java-early-access:
+  java-distribution:
+    description: 'Java distribution to use'
     required: false
-    default: 'false'
+    default: 'liberica'
+  java-early-access:
     description: 'Whether the Java version is in early access'
-  java-toolchain:
     required: false
     default: 'false'
+  java-toolchain:
     description: 'Whether a Java toolchain should be used'
-  publish:
     required: false
     default: 'false'
+  java-version:
+    description: 'Java version to compile and test with'
+    required: false
+    default: '17'
+  publish:
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
-  develocity-access-key:
     required: false
-    description: 'The access key for authentication with ge.spring.io'
+    default: 'false'
 outputs:
   build-scan-url:
-    description: 'The URL, if any, of the build scan produced by the build'
+    description: 'URL, if any, of the build scan produced by the build'
     value: ${{ (inputs.publish == 'true' && steps.publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }}
   version:
-    description: 'The version that was built'
+    description: 'Version that was built'
     value: ${{ steps.read-version.outputs.version }}
 runs:
   using: composite
@@ -34,9 +38,10 @@ runs:
       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-early-access: ${{ inputs.java-early-access }}
         java-toolchain: ${{ inputs.java-toolchain }}
+        java-version: ${{ inputs.java-version }}
     - name: Build
       id: build
       if: ${{ inputs.publish == 'false' }}

.github/actions/build/action.yml

@@ -1,27 +1,27 @@
 name: Create GitHub Release
-description: Create the release on GitHub with a changelog
+description: 'Create the release on GitHub with a changelog'
 inputs:
   milestone:
-    description: Name of the GitHub milestone for which a release will be created
-    required: true
-  token:
-    description: Token to use for authentication with GitHub
+    description: 'Name of the GitHub milestone for which a release will be created'
     required: true
   pre-release:
-    description: Whether the release is a pre-release (a milestone or release candidate)
+    description: 'Whether the release is a pre-release (a milestone or release candidate)'
     required: false
     default: 'false'
+  token:
+    description: 'Token to use for authentication with GitHub'
+    required: true
 runs:
   using: composite
   steps:
     - name: Generate Changelog
       uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
       with:
+        config-file: .github/actions/create-github-release/changelog-generator.yml
         milestone: ${{ inputs.milestone }}
         token: ${{ inputs.token }}
-        config-file: .github/actions/create-github-release/changelog-generator.yml
     - name: Create GitHub Release
+      shell: bash
       env:
         GITHUB_TOKEN: ${{ inputs.token }}
-      shell: bash
       run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md ${{ inputs.pre-release == 'true' && '--prerelease' || '' }}

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

@@ -1,33 +1,37 @@
-name: 'Prepare Gradle Build'
+name: Prepare Gradle Build
 description: 'Prepares a Gradle build. Sets up Java and Gradle and configures Gradle properties'
 inputs:
-  java-version:
+  develocity-access-key:
+    description: 'Access key for authentication with ge.spring.io'
     required: false
-    default: '17'
-    description: 'The Java version to use for the build'
+  java-distribution:
+    description: 'Java distribution to use'
+    required: false
+    default: 'liberica'
   java-early-access:
+    description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
     required: false
     default: 'false'
-    description: 'Whether the Java version is in early access'
   java-toolchain:
+    description: 'Whether a Java toolchain should be used'
     required: false
     default: 'false'
-    description: 'Whether a Java toolchain should be used'
-  develocity-access-key:
+  java-version:
+    description: 'Java version to use for the build'
     required: false
-    description: 'The access key for authentication with ge.spring.io'
+    default: '17'
 runs:
   using: composite
   steps:
     - name: Set Up Java
       uses: actions/setup-java@v4
       with:
-        distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
+        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' && '17' || '' }}
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
+      uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}

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

@@ -1,5 +1,5 @@
 name: Print JVM thread dumps
-description: Prints a thread dump for all running JVMs
+description: 'Prints a thread dump for all running JVMs'
 runs:
   using: composite
   steps:

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

@@ -1,33 +1,39 @@
 name: Send Notification
-description: Sends a Google Chat message as a notification of the job's outcome
+description: 'Sends a Google Chat message as a notification of the job''s outcome'
 inputs:
-  webhook-url:
-    description: 'Google Chat Webhook URL'
-    required: true
-  status:
-    description: 'Status of the job'
-    required: true
   build-scan-url:
     description: 'URL of the build scan to include in the notification'
+    required: false
   run-name:
     description: 'Name of the run to include in the notification'
+    required: false
     default: ${{ format('{0} {1}', github.ref_name, github.job) }}
+  status:
+    description: 'Status of the job'
+    required: true
+  webhook-url:
+    description: 'Google Chat Webhook URL'
+    required: true
 runs:
   using: composite
   steps:
-    - shell: bash
+    - name: Prepare Variables
+      shell: bash
       run: |
         echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV"
         echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV"
-    - shell: bash
+    - name: Success Notification
       if: ${{ inputs.status == 'success' }}
+      shell: bash
       run: |
         curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
+    - name: Failure Notification
       if: ${{ inputs.status == 'failure' }}
+      shell: bash
       run: |
         curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<users/all> *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
+    - name: Cancel Notification
       if: ${{ inputs.status == 'cancelled' }}
+      shell: bash
       run: |
         curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancelled"}' || true

.github/actions/send-notification/action.yml

@@ -1,26 +1,26 @@
 name: Sync to Maven Central
-description: Syncs a release to Maven Central and waits for it to be available for use
+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
-  spring-framework-version:
-    description: 'The version of Spring Framework that is being synced to Central'
-    required: true
-  ossrh-s01-token-username:
-    description: 'Username for authentication with s01.oss.sonatype.org'
+  ossrh-s01-staging-profile:
+    description: 'Staging profile to use when syncing to Central'
     required: true
   ossrh-s01-token-password:
     description: 'Password for authentication with s01.oss.sonatype.org'
     required: true
-  ossrh-s01-staging-profile:
-    description: 'Staging profile to use when syncing to Central'
+  ossrh-s01-token-username:
+    description: 'Username for authentication with s01.oss.sonatype.org'
+    required: true
+  spring-framework-version:
+    description: 'Version of Spring Framework that is being synced to Central'
     required: true
 runs:
   using: composite
   steps:
     - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1
+      uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
       env:
         JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
     - name: Download Release Artifacts
@@ -29,14 +29,14 @@ runs:
     - name: Sync
       uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
       with:
-        username: ${{ inputs.ossrh-s01-token-username }}
+        close: true
+        create: true
+        generate-checksums: true
         password: ${{ inputs.ossrh-s01-token-password }}
+        release: true
         staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
-        create: true
         upload: true
-        close: true
-        release: true
-        generate-checksums: true
+        username: ${{ inputs.ossrh-s01-token-username }}
     - name: Await
       uses: ./.github/actions/await-http-resource
       with:

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

@@ -1,5 +1,4 @@
 name: Backport Bot
-
 on:
   issues:
     types: [labeled]
@@ -29,6 +28,6 @@ jobs:
         run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
       - name: Backport
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_EVENT: ${{ toJSON(github.event) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: java -jar backport-bot-0.0.1-SNAPSHOT.jar --github.accessToken="$GITHUB_TOKEN" --github.event_name "$GITHUB_EVENT_NAME" --github.event "$GITHUB_EVENT"

.github/workflows/backport-bot.yml

@@ -8,41 +8,41 @@ concurrency:
 jobs:
   build-and-deploy-snapshot:
     name: Build and Deploy Snapshot
+    if: ${{ github.repository == 'spring-projects/spring-framework' }}
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
     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 }}
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           publish: true
       - name: Deploy
         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: 'spring-framework-6.2.x'
-          repository: 'libs-snapshot-local'
-          folder: 'deployment-repository'
-          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
           artifact-properties: |
             /**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
             /**/framework-api-*-docs.zip::zip.type=docs
             /**/framework-api-*-schema.zip::zip.type=schema
+          build-name: 'spring-framework-7.0.x'
+          folder: 'deployment-repository'
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          repository: 'libs-snapshot-local'
+          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
       - name: Send Notification
-        uses: ./.github/actions/send-notification
         if: always()
+        uses: ./.github/actions/send-notification
         with:
-          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
-          status: ${{ job.status }}
           build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
           run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
     outputs:
       version: ${{ steps.build-and-publish.outputs.version }}
   verify: