Merge branch '2.6.x' into 2.7.x

Closes gh-32467
spring-projects · Sep 21, 2022 · 7566666 · 7566666
2 parents 3620959 + 5affcec
commit 7566666
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
@@ -15,7 +15,7 @@ case "$1" in
 		 echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1+1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz"
 	;;
 	java19)
-		 echo "https://github.com/adoptium/temurin19-binaries/releases/download/jdk19-2022-09-06-18-04-beta/OpenJDK19U-jdk_x64_linux_hotspot_2022-09-06-18-04.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/19+37/bellsoft-jdk19+37-linux-amd64.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -374,6 +374,12 @@ jobs:
       params:
         <<: *github-task-params
         JDK_VERSION: java18
+    - task: detect-jdk19-update
+      image: ci-image
+      file: git-repo/ci/tasks/detect-jdk-updates.yml
+      params:
+        <<: *github-task-params
+        JDK_VERSION: java19
 - name: detect-ubuntu-image-updates
   plan:
   - get: git-repo

diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh
@@ -24,6 +24,10 @@ case "$JDK_VERSION" in
 		 BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=18"
 		 ISSUE_TITLE="Upgrade Java 18 version in CI image"
 	;;
+	java19)
+		 BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=19"
+		 ISSUE_TITLE="Upgrade Java 19 version in CI image"
+	;;
 	*)
 		echo $"Unknown java version"
 		exit 1;