Merge branch '2.5.x' into 2.6.x

Closes gh-30123
2022-03-09 12:37:45 +00:00
parent cf872caa96 20d21d4e58
commit b0e4cabdd8
6 changed files with 123 additions and 5 deletions
--- a/ci/scripts/detect-jdk-updates.sh
+++ b/ci/scripts/detect-jdk-updates.sh
@@ -20,6 +20,10 @@ case "$JDK_VERSION" in
 		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ga"
 		 ISSUE_TITLE="Upgrade Java 17 version in CI image"
 	;;
+	java18)
+		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/18/ea"
+		 ISSUE_TITLE="Upgrade Java 18 version in CI image"
+	;;
 	*)
 		echo $"Unknown java version"
 		exit 1;