Merge branch '3.5.x'

Closes gh-48547

Author: snicoll

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

@@ -18,7 +18,7 @@ jobs:
         uses: ./.github/actions/print-jvm-thread-dumps
       - name: Upload Build Reports
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: build-reports
           path: '**/build/reports/'

.github/workflows/verify.yml

@@ -79,7 +79,7 @@ jobs:
         run: ./gradlew spring-boot-release-verification-tests:test
       - name: Upload Build Reports on Failure
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: build-reports
           path: '**/build/reports/'