Merge branch '2.1.x' into 2.2.x

ci/pipeline.yml

@@ -12,12 +12,13 @@ anchors:
     GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
     GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
     GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
+    BRANCH: ((branch))
+    CI: true
   build-project-task-params: &build-project-task-params
     privileged: true
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/build-project.yml
     params:
-      BRANCH: ((branch))
       <<: *gradle-enterprise-task-params
   github-task-params: &github-task-params
     GITHUB_REPO: spring-boot
@@ -281,21 +282,18 @@ jobs:
         file: git-repo/ci/tasks/build-smoke-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
       - task: build-integration-tests
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
       - task: build-deployment-tests
         image: spring-boot-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
     on_failure:
       do:
@@ -377,21 +375,18 @@ jobs:
         file: git-repo/ci/tasks/build-smoke-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
       - task: build-integration-tests
         image: spring-boot-jdk11-ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
       - task: build-deployment-tests
         image: spring-boot-jdk11-ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
     on_failure:
       do:
@@ -424,21 +419,18 @@ jobs:
               image: spring-boot-jdk14-ci-image
               file: git-repo/ci/tasks/build-smoke-tests.yml
               params:
-                BRANCH: ((branch))
                 <<: *gradle-enterprise-task-params
             - task: build-integration-tests
               timeout: ((task-timeout))
               image: spring-boot-jdk14-ci-image
               file: git-repo/ci/tasks/build-integration-tests.yml
               params:
-                BRANCH: ((branch))
                 <<: *gradle-enterprise-task-params
             - task: build-deployment-tests
               timeout: ((task-timeout))
               image: spring-boot-jdk14-ci-image
               file: git-repo/ci/tasks/build-deployment-tests.yml
               params:
-                BRANCH: ((branch))
                 <<: *gradle-enterprise-task-params
       on_failure:
         do:
@@ -467,7 +459,6 @@ jobs:
         - WIN64
         timeout: ((task-timeout))
         params:
-          BRANCH: ((branch))
           <<: *gradle-enterprise-task-params
       on_failure:
         do:
@@ -489,6 +480,8 @@ jobs:
     params:
       RELEASE_TYPE: M
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+      BRANCH: ((branch))
+      CI: true
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params
@@ -508,6 +501,8 @@ jobs:
     params:
       RELEASE_TYPE: RC
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+      BRANCH: ((branch))
+      CI: true
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params
@@ -527,6 +522,8 @@ jobs:
     params:
       RELEASE_TYPE: RELEASE
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+      BRANCH: ((branch))
+      CI: true
   - put: artifactory-repo
     params:
       <<: *artifactory-repo-put-params