Merge branch '2.5.x'

Closes gh-28104

Author: snicoll

ci/scripts/detect-jdk-updates.sh

@@ -17,7 +17,7 @@ case "$JDK_VERSION" in
 		 ISSUE_TITLE="Upgrade Java 11 version in CI image"
 	;;
 	java17)
-		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ea"
+		 BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ga"
 		 ISSUE_TITLE="Upgrade Java 17 version in CI image"
 	;;
 	*)