Merge branch '2.2.x' into 2.3.x

Author: philwebb

ci/images/spring-boot-jdk14-ci-image/Dockerfile renamed to ci/images/spring-boot-jdk15-ci-image/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200807
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 ADD get-docker-url.sh /get-docker-url.sh
-RUN ./setup.sh java14
+RUN ./setup.sh java15
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH

ci/pipeline.yml

@@ -144,12 +144,12 @@ resources:
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
-- name: spring-boot-jdk14-ci-image
+- name: spring-boot-jdk15-ci-image
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-boot-jdk14-ci-image
+    repository: ((docker-hub-organization))/spring-boot-jdk15-ci-image
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -174,14 +174,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk14-build
+- name: repo-status-jdk15-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk14-build
+    context: jdk15-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -212,10 +212,10 @@ jobs:
       params:
         build: ci-images-git-repo/ci/images
         dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image/Dockerfile
-    - put: spring-boot-jdk14-ci-image
+    - put: spring-boot-jdk15-ci-image
       params:
         build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile
+        dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk15-ci-image/Dockerfile
 - name: detect-jdk-updates
   plan:
   - get: git-repo
@@ -235,12 +235,12 @@ jobs:
       params:
         <<: *github-task-params
         JDK_VERSION: java11
-    - task: detect-jdk14-update
+    - task: detect-jdk15-update
       image: spring-boot-ci-image
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
         <<: *github-task-params
-        JDK_VERSION: java14
+        JDK_VERSION: java15
 - name: detect-ubuntu-image-updates
   plan:
   - get: git-repo
@@ -353,27 +353,27 @@ jobs:
   - put: slack-alert
     params:
       <<: *slack-success-params
-- name: jdk14-build
+- name: jdk15-build
   serial: true
   public: true
   plan:
-    - get: spring-boot-jdk14-ci-image
+    - get: spring-boot-jdk15-ci-image
     - get: git-repo
       trigger: true
-    - put: repo-status-jdk14-build
+    - put: repo-status-jdk15-build
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: build-project
-        image: spring-boot-jdk14-ci-image
+        image: spring-boot-jdk15-ci-image
         <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk14-build
+          - put: repo-status-jdk15-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk14-build
+    - put: repo-status-jdk15-build
       params: { state: "success", commit: "git-repo" }
     - put: slack-alert
       params:
@@ -567,7 +567,7 @@ jobs:
       body: generated-release-notes/release-notes.md
 groups:
 - name: "Build"
-  jobs: ["build", "jdk11-build", "jdk14-build", "windows-build"]
+  jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
 - name: "Release"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
 - name: "CI Images"