Merge branch '2.1.x' into 2.2.x

ci/parameters.yml

@@ -6,6 +6,7 @@ github-repo-name: "spring-projects/spring-boot"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
 branch: "2.2.x"
+milestone: "2.2.x"
 build-name: "spring-boot"
 pipeline-name: "spring-boot"
 concourse-url: "https://ci.spring.io"

ci/pipeline.yml

@@ -183,7 +183,7 @@ jobs:
         GITHUB_PASSWORD: ((github-password))
         GITHUB_USERNAME: ((github-username))
         JDK_VERSION: java8
-        MILESTONE: ((branch))
+        MILESTONE: ((milestone))
       image: spring-boot-ci-image
     - task: detect-jdk11-update
       file: git-repo/ci/tasks/detect-jdk-updates.yml
@@ -193,7 +193,7 @@ jobs:
         GITHUB_PASSWORD: ((github-password))
         GITHUB_USERNAME: ((github-username))
         JDK_VERSION: java11
-        MILESTONE: ((branch))
+        MILESTONE: ((milestone))
       image: spring-boot-ci-image
     - task: detect-jdk14-update
       file: git-repo/ci/tasks/detect-jdk-updates.yml
@@ -203,7 +203,7 @@ jobs:
         GITHUB_PASSWORD: ((github-password))
         GITHUB_USERNAME: ((github-username))
         JDK_VERSION: java14
-        MILESTONE: ((branch))
+        MILESTONE: ((milestone))
       image: spring-boot-ci-image
 - name: detect-ubuntu-image-updates
   plan:
@@ -219,7 +219,7 @@ jobs:
         GITHUB_ORGANIZATION: spring-projects
         GITHUB_PASSWORD: ((github-password))
         GITHUB_USERNAME: ((github-username))
-        MILESTONE: ((branch))
+        MILESTONE: ((milestone))
       image: spring-boot-ci-image
 - name: detect-docker-updates
   plan:
@@ -234,7 +234,7 @@ jobs:
       params:
         GITHUB_REPO: spring-boot
         GITHUB_ORGANIZATION: spring-projects
-        MILESTONE: ((branch))
+        MILESTONE: ((milestone))
       image: spring-boot-ci-image
     - put: git-repo-ci-docker
       params: