From 0630d864f5ac9c27a5b80d3179b0ba134f5fd524 Mon Sep 17 00:00:00 2001
From: Mark Evenson <evenson.not.org@gmail.com>
Date: Sat, 27 Apr 2024 15:25:56 +0200
Subject: [PATCH] ci: update openjdk installation; tesk openjdk22

---
 .github/workflows/abcl-test.yml |  2 +-
 ci/install-openjdk.bash         | 51 ++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/abcl-test.yml b/.github/workflows/abcl-test.yml
index d0a0a2432..924e23ad1 100644
--- a/.github/workflows/abcl-test.yml
+++ b/.github/workflows/abcl-test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        jdk: [openjdk8, openjdk11, openjdk17, openjdk21]
+        jdk: [openjdk8, openjdk11, openjdk17, openjdk21, openjdk22]
         
     steps:
       - name: Set path for build scripts
diff --git a/ci/install-openjdk.bash b/ci/install-openjdk.bash
index d4635274e..bb31e9581 100644
--- a/ci/install-openjdk.bash
+++ b/ci/install-openjdk.bash
@@ -25,15 +25,15 @@ function determine_openjdk() {
         [Dd]arwin|darwin|macos)
             case $jdk in
                 openjdk8)
-                    v=402
-                    build=b06
+                    v=412
+                    build=b08
                     version=1.8.0.${v}
                     topdir=jdk8u${v}-${build}
                     dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u${v}-${build}/OpenJDK8U-jdk_x64_mac_hotspot_8u${v}${build}.tar.gz"
                     ;;
                 openjdk11)
-                    version=11.0.22
-                    build=7
+                    version=11.0.23
+                    build=9
                     topdir=jdk-${version}+${build}
                     dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -53,8 +53,8 @@ function determine_openjdk() {
                     dist="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz"
                     ;;
                 openjdk17)
-                    version=17.0.10
-                    build=7
+                    version=17.0.11
+                    build=9
                     topdir="jdk-${version}+${build}"
                     dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_mac_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -78,8 +78,17 @@ function determine_openjdk() {
                     ;;
                 openjdk21)
                     v="21"
-                    id="${v}.0.2"
-                    rev="13"
+                    id="${v}.0.3"
+                    rev="9"
+                    arch="jdk_x64_mac_hotspot"
+
+                    topdir="jdk-${id}+${rev}"
+                    dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
+                    ;;
+                openjdk22)
+                    v="22"
+                    id="${v}.0.1"
+                    rev="8"
                     arch="jdk_x64_mac_hotspot"
                     topdir="jdk-${id}+${rev}"
                     dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
@@ -89,14 +98,14 @@ function determine_openjdk() {
         [Ll]inux)
             case $jdk in
                 openjdk8)
-                    version=u402
-                    build=b06
+                    version=u412
+                    build=b08
                     topdir=jdk8${version}-${build}
                     dist="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8${version}-${build}/OpenJDK8U-jdk_x64_linux_hotspot_8${version}${build}.tar.gz"
                     ;;
                 openjdk11)
-                    version=11.0.22
-                    build=7
+                    version=11.0.23
+                    build=9
                     topdir=jdk-${version}+${build}
                     dist="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK11U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -116,8 +125,8 @@ function determine_openjdk() {
                     dist="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
                     ;;
                 openjdk17)
-                    version=17.0.10
-                    build=7
+                    version=17.0.11
+                    build=9
                     topdir="jdk-${version}+${build}"
                     dist="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/OpenJDK17U-jdk_x64_linux_hotspot_${version}_${build}.tar.gz"
                     ;;
@@ -140,13 +149,21 @@ function determine_openjdk() {
                     ;;
                 openjdk21)
                     v="21"
-                    id="${v}.0.2"
-                    rev="13"
+                    id="${v}.0.3"
+                    rev="9"
                     arch="jdk_x64_linux_hotspot"
                     topdir="jdk-${id}+${rev}"
                     dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
                     ;;
-esac
+                openjdk22)
+                    v="22"
+                    id="${v}.0.1"
+                    rev="8"
+                    arch="jdk_x64_linux_hotspot"
+                    topdir="jdk-${id}+${rev}"
+                    dist="https://github.com/adoptium/temurin${v}-binaries/releases/download/jdk-${id}%2B${rev}/OpenJDK${v}U-${arch}_${id}_${rev}.tar.gz"
+                    ;;
+            esac
             ;;
         *)
             echo No known dist for ${uname}