Revert unnecessary merges on 6.0.x

This commit removes unnecessary main-branch merges starting from
8750608 and adds the following
needed commit(s) that were made afterward:

- 5dce82c

Author: Steve Riesenberg

.github/dependabot.yml

@@ -69,28 +69,21 @@ jobs:
   snapshot_tests:
     name: Test against snapshots
     needs: [prerequisites]
-    strategy:
-      matrix:
-        include:
-          - java-version: '21-ea'
-            toolchain: '21'
-          - java-version: '17'
-            toolchain: '17'
     runs-on: ubuntu-latest
     if: needs.prerequisites.outputs.runjobs
     steps:
       - uses: actions/checkout@v3
       - name: Set up gradle
         uses: spring-io/spring-gradle-build-action@v1
         with:
-          java-version: ${{ matrix.java-version }}
+          java-version: '17'
           distribution: 'temurin'
       - name: Snapshot Tests
         run: |
           export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
           export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
           export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
-          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion='6.1.+' -PreactorVersion='2023.0.+' -PspringDataVersion='2023.1.+' -PlocksDisabled --stacktrace
+          ./gradlew test --refresh-dependencies -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PspringFrameworkVersion='6.0.+' -PreactorVersion='2022.0.+' -PspringDataVersion='2022.0.+' -PlocksDisabled --stacktrace
   check_samples:
     name: Check Samples project
     needs: [prerequisites]

.github/workflows/continuous-integration-workflow.yml

@@ -7,8 +7,8 @@ on:
     tags: '**'
   repository_dispatch:
     types: request-build-reference # legacy
-  #schedule:
-  #- cron: '0 10 * * *' # Once per day at 10am UTC
+  schedule:
+  - cron: '0 10 * * *' # Once per day at 10am UTC
   workflow_dispatch:
 permissions: read-all
 jobs:

.github/workflows/deploy-docs.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         # List of active maintenance branches.
-        branch: [ main, 6.1.x, 6.0.x, 5.8.x ]
+        branch: [ main, 6.0.x, 5.8.x, 5.7.x, 5.6.x ]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout