Merge branch '2.2.x'

Closes gh-20599

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.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz"
 	;;
-	java13)
-		 echo "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz"
-	;;
 	java14)
 		 echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz"
 	;;

ci/images/spring-boot-jdk13-ci-image/Dockerfile

@@ -1,11 +0,0 @@
-FROM ubuntu:bionic-20200219
-
-ADD setup.sh /setup.sh
-ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java13
-
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH
-ADD docker-lib.sh /docker-lib.sh
-
-ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

ci/pipeline.yml

@@ -86,14 +86,6 @@ resources:
     username: ((docker-hub-username))
     password: ((docker-hub-password))
     tag: 2.3.x
-- name: spring-boot-jdk13-ci-image
-  type: docker-image
-  icon: docker
-  source:
-    repository: ((docker-hub-organization))/spring-boot-jdk13-ci-image
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    tag: 2.3.x
 - name: spring-boot-jdk14-ci-image
   type: docker-image
   icon: docker
@@ -126,14 +118,6 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk13-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk13-build
 - name: repo-status-jdk14-build
   type: github-status-resource
   icon: eye-check-outline
@@ -172,10 +156,6 @@ 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-jdk13-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-boot-jdk13-ci-image/Dockerfile
     - put: spring-boot-jdk14-ci-image
       params:
         build: ci-images-git-repo/ci/images
@@ -205,15 +185,6 @@ jobs:
         GITHUB_USERNAME: ((github-username))
         JDK_VERSION: java11
       image: spring-boot-ci-image
-    - task: detect-jdk13-update
-      file: git-repo/ci/tasks/detect-jdk-updates.yml
-      params:
-        GITHUB_REPO: spring-boot
-        GITHUB_ORGANIZATION: spring-projects
-        GITHUB_PASSWORD: ((github-password))
-        GITHUB_USERNAME: ((github-username))
-        JDK_VERSION: java13
-      image: spring-boot-ci-image
     - task: detect-jdk14-update
       file: git-repo/ci/tasks/detect-jdk-updates.yml
       params:
@@ -366,44 +337,6 @@ jobs:
       silent: true
       icon_emoji: ":concourse:"
       username: concourse-ci
-- name: jdk13-build
-  serial: true
-  public: true
-  plan:
-    - get: spring-boot-jdk13-ci-image
-    - get: git-repo
-      trigger: true
-    - put: repo-status-jdk13-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-      - task: build-project
-        privileged: true
-        timeout: ((task-timeout))
-        image: spring-boot-jdk13-ci-image
-        file: git-repo/ci/tasks/build-project.yml
-        params:
-          BRANCH: ((branch))
-          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))
-      on_failure:
-        do:
-          - put: repo-status-jdk13-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
-              silent: true
-              icon_emoji: ":concourse:"
-              username: concourse-ci
-    - put: repo-status-jdk13-build
-      params: { state: "success", commit: "git-repo" }
-    - put: slack-alert
-      params:
-        text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>"
-        silent: true
-        icon_emoji: ":concourse:"
-        username: concourse-ci
 - name: jdk14-build
   serial: true
   public: true
@@ -658,7 +591,7 @@ jobs:
       body: generated-release-notes/release-notes.md
 groups:
 - name: "Build"
-  jobs: ["build", "jdk11-build", "jdk13-build", "jdk14-build", "windows-build"]
+  jobs: ["build", "jdk11-build", "jdk14-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"

ci/scripts/detect-jdk-updates.sh

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