Merge branch '2.3.x'

ci/images/get-jdk-url.sh

@@ -8,9 +8,6 @@ case "$1" in
 	java11)
 		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz"
 	;;
-	java14)
-		 echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz"
-	;;
 	java15)
 		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz"
 	;;

ci/parameters.yml

@@ -8,7 +8,8 @@ artifactory-server: "https://repo.spring.io"
 branch: "master"
 milestone: "2.4.x"
 build-name: "spring-boot"
-pipeline-name: "spring-boot"
+pipeline-name: "spring-boot-2.4.x"
+ci-image-name: "spring-boot-ci-24x"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
 bintray-repo: "jars"

ci/pipeline.yml

@@ -132,30 +132,24 @@ resources:
     uri: ((github-repo))
     branch: ((branch))
     paths: ["ci/images/*"]
-- name: spring-boot-ci-image
+- name: ci-image
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-boot-ci-image
-- name: spring-boot-jdk11-ci-image
+    repository: ((docker-hub-organization))/((ci-image-name))
+- name: ci-image-jdk11
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
-- name: spring-boot-jdk14-ci-image
+    repository: ((docker-hub-organization))/((ci-image-name))-jdk11
+- name: ci-image-jdk15
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/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-jdk15-ci-image
+    repository: ((docker-hub-organization))/((ci-image-name))-jdk15
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -180,14 +174,6 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk14-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
 - name: repo-status-jdk15-build
   type: github-status-resource
   icon: eye-check-outline
@@ -213,54 +199,44 @@ resources:
   icon: clock-outline
   source: { interval: "24h" }
 jobs:
-- name: build-spring-boot-ci-images
+- name: build-ci-images
   plan:
   - get: ci-images-git-repo
     trigger: true
   - in_parallel:
-    - put: spring-boot-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-boot-ci-image/Dockerfile
-    - put: spring-boot-jdk11-ci-image
+    - put: ci-image
       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
+        dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
+    - put: ci-image-jdk11
       params:
         build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk14-ci-image/Dockerfile
-    - put: spring-boot-jdk15-ci-image
+        dockerfile: ci-images-git-repo/ci/images/ci-image-jdk11/Dockerfile
+    - put: ci-image-jdk15
       params:
         build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk15-ci-image/Dockerfile
+        dockerfile: ci-images-git-repo/ci/images/ci-image-jdk15/Dockerfile
 - name: detect-jdk-updates
   plan:
   - get: git-repo
   - get: every-wednesday
     trigger: true
-  - get: spring-boot-ci-image
+  - get: ci-image
   - in_parallel:
     - task: detect-jdk8-update
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
         <<: *github-task-params
         JDK_VERSION: java8
     - task: detect-jdk11-update
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
         <<: *github-task-params
         JDK_VERSION: java11
-    - task: detect-jdk14-update
-      image: spring-boot-ci-image
-      file: git-repo/ci/tasks/detect-jdk-updates.yml
-      params:
-        <<: *github-task-params
-        JDK_VERSION: java14
     - task: detect-jdk15-update
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
         <<: *github-task-params
@@ -270,10 +246,10 @@ jobs:
   - get: git-repo
   - get: every-wednesday
     trigger: true
-  - get: spring-boot-ci-image
+  - get: ci-image
   - do:
     - task: detect-ubuntu-image-updates
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/detect-ubuntu-image-updates.yml
       params:
         <<: *github-task-params
@@ -282,10 +258,10 @@ jobs:
   - get: git-repo
   - get: every-wednesday
     trigger: true
-  - get: spring-boot-ci-image
+  - get: ci-image
   - do:
     - task: detect-docker-updates
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/detect-docker-updates.yml
       params:
         <<: *github-task-params
@@ -293,14 +269,14 @@ jobs:
   serial: true
   public: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: true
   - put: repo-status-build
     params: { state: "pending", commit: "git-repo" }
   - do:
     - task: build-project
-      image: spring-boot-ci-image
+      image: ci-image
       <<: *build-project-task-params
     on_failure:
       do:
@@ -328,7 +304,7 @@ jobs:
   serial: true
   public: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     resource: git-pull-request
     trigger: true
@@ -339,7 +315,7 @@ jobs:
         path: git-repo
         status: pending
     - task: build-project
-      image: spring-boot-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/build-pr-project.yml
       timeout: ((task-timeout))
     on_success:
@@ -356,14 +332,14 @@ jobs:
   serial: true
   public: true
   plan:
-  - get: spring-boot-jdk11-ci-image
+  - get: ci-image-jdk11
   - get: git-repo
     trigger: true
   - put: repo-status-jdk11-build
     params: { state: "pending", commit: "git-repo" }
   - do:
     - task: build-project
-      image: spring-boot-jdk11-ci-image
+      image: ci-image-jdk11
       <<: *build-project-task-params
     on_failure:
       do:
@@ -377,43 +353,18 @@ jobs:
   - put: slack-alert
     params:
       <<: *slack-success-params
-- name: jdk14-build
-  serial: true
-  public: true
-  plan:
-    - get: spring-boot-jdk14-ci-image
-    - get: git-repo
-      trigger: true
-    - put: repo-status-jdk14-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-      - task: build-project
-        image: spring-boot-jdk14-ci-image
-        <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk14-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk14-build
-      params: { state: "success", commit: "git-repo" }
-    - put: slack-alert
-      params:
-        <<: *slack-success-params
 - name: jdk15-build
   serial: true
   public: true
   plan:
-    - get: spring-boot-jdk15-ci-image
+    - get: ci-image-jdk15
     - get: git-repo
       trigger: true
     - put: repo-status-jdk15-build
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: build-project
-        image: spring-boot-jdk15-ci-image
+        image: ci-image-jdk15
         <<: *build-project-task-params
       on_failure:
         do:
@@ -455,11 +406,11 @@ jobs:
 - name: stage-milestone
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - task: stage
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: M
@@ -474,11 +425,11 @@ jobs:
 - name: stage-rc
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - task: stage
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RC
@@ -493,11 +444,11 @@ jobs:
 - name: stage-release
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - task: stage
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RELEASE
@@ -512,7 +463,7 @@ jobs:
 - name: promote-milestone
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -522,7 +473,7 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: M
@@ -541,7 +492,7 @@ jobs:
 - name: promote-rc
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -551,7 +502,7 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RC
@@ -570,7 +521,7 @@ jobs:
 - name: promote-release
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -580,7 +531,7 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RELEASE
@@ -589,7 +540,7 @@ jobs:
 - name: sync-to-maven-central
   serial: true
   plan:
-  - get: spring-boot-ci-image
+  - get: ci-image
   - get: git-repo
   - get: artifactory-repo
     trigger: true
@@ -598,7 +549,7 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: sync-to-maven-central
-    image: spring-boot-ci-image
+    image: ci-image
     file: git-repo/ci/tasks/sync-to-maven-central.yml
     params:
       <<: *bintray-task-params
@@ -615,11 +566,11 @@ jobs:
       tag: generated-release-notes/tag
       body: generated-release-notes/release-notes.md
 groups:
-- name: "Build"
-  jobs: ["build", "jdk11-build", "jdk14-build", "jdk15-build", "windows-build"]
-- name: "Release"
+- name: "builds"
+  jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
+- name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
-- name: "CI Images"
-  jobs: ["build-spring-boot-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
-- name: "Build Pull Requests"
+- name: "ci-images"
+  jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
+- name: "pull-requests"
   jobs: ["build-pull-requests"]

ci/scripts/detect-jdk-updates.sh

@@ -16,10 +16,6 @@ case "$JDK_VERSION" in
 		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga"
 		 ISSUE_TITLE="Upgrade Java 11 version in CI image"
 	;;
-	java14)
-		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14/ga"
-		 ISSUE_TITLE="Upgrade Java 14 version in CI image"
-	;;
 	java15)
 		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
 		 ISSUE_TITLE="Upgrade Java 15 version in CI image"