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/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"