Merge branch '2.7.x' into 3.0.x

Closes gh-34055

Author: philwebb

ci/pipeline.yml

@@ -62,7 +62,7 @@ anchors:
     repo: libs-snapshot-local
     folder: distribution-repository
     build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
-    build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
+    build_number: "${BUILD_JOB_NAME}-${BUILD_NAME}"
     disable_checksum_uploads: true
     threads: 8
     artifact_set:
@@ -109,7 +109,7 @@ resource_types:
   source:
     <<: *registry-image-resource-source
     repository: springio/artifactory-resource
-    tag: 0.0.17
+    tag: 0.0.18
 - name: pull-request
   type: registry-image
   source:
@@ -206,6 +206,8 @@ resources:
     username: ((artifactory-username))
     password: ((artifactory-password))
     build_name: ((build-name))
+    build_number_prefix: "${BUILD_PIPELINE_NAME}-"
+    check_limit: 500
 - name: repo-status-build
   type: github-status-resource
   icon: eye-check-outline