Merge branch '2.1.x'

Closes gh-17311

ci/pipeline.yml

@@ -149,7 +149,7 @@ jobs:
   - get: every-wednesday
     trigger: true
   - get: spring-boot-ci-image
-  - aggregate:
+  - in_parallel:
     - task: detect-jdk8-update
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
@@ -192,7 +192,7 @@ jobs:
       timeout: 1h30m
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/build-project.yml
-    - aggregate:
+    - in_parallel:
       - task: build-smoke-tests
         timeout: 1h30m
         image: spring-boot-ci-image
@@ -258,7 +258,7 @@ jobs:
       timeout: 1h30m
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/build-pr-project.yml
-    - aggregate:
+    - in_parallel:
       - task: build-smoke-tests
         timeout: 1h30m
         image: spring-boot-ci-image
@@ -296,7 +296,7 @@ jobs:
       timeout: 1h30m
       image: spring-boot-jdk11-ci-image
       file: git-repo/ci/tasks/build-project.yml
-    - aggregate:
+    - in_parallel:
       - task: build-smoke-tests
         timeout: 1h30m
         image: spring-boot-jdk11-ci-image
@@ -342,7 +342,7 @@ jobs:
           timeout: 1h30m
           image: spring-boot-jdk12-ci-image
           file: git-repo/ci/tasks/build-project.yml
-        - aggregate:
+        - in_parallel:
             - task: build-smoke-tests
               timeout: 1h30m
               image: spring-boot-jdk12-ci-image