[ci] Test against JDK24

Author: alexander-yakushev

.circleci/config.yml

@@ -29,9 +29,9 @@ executors:
     docker:
       - image: clojure:temurin-21-lein-2.11.2-noble
     <<: *defaults
-  jdk23:
+  jdk24:
     docker:
-      - image: clojure:temurin-23-lein-2.11.2-noble
+      - image: clojure:temurin-24-lein-2.11.2-noble
     <<: *defaults
 
 # Runs a given set of steps, with some standard pre- and post-
@@ -81,7 +81,7 @@ commands:
             - base-src-jdk11.zip
             - base-src-jdk17.zip
             - base-src-jdk21.zip
-            - base-src-jdk23.zip
+            - base-src-jdk24.zip
           key: cache-<< parameters.cache_version >>-{{ checksum "/tmp/clojure_cache_seed" }}
 
   setup-windows:
@@ -204,7 +204,7 @@ workflows:
           matrix:
             alias: "test"
             parameters:
-              jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk23]
+              jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk24]
               clojure_version: ["1.10", "1.11", "1.12"]
           <<: *run_always
       - test:
@@ -213,7 +213,7 @@ workflows:
           matrix:
             alias: "test_no_extra_deps"
             parameters:
-              jdk_version: [jdk23]
+              jdk_version: [jdk24]
               clojure_version: ["1.12"]
               command: ["test-no-extra-deps"]
           <<: *run_always
@@ -225,7 +225,7 @@ workflows:
           matrix:
             alias: "eastwood"
             parameters:
-              jdk_version: [jdk8, jdk23]
+              jdk_version: [jdk8, jdk24]
           <<: *run_always
       - lint:
           <<: *run_always

.circleci/download-jdk-sources.sh

@@ -7,7 +7,7 @@ DEST=$3
 # that is normally distributed with JDK.
 wget "$URL" -O full-src.zip
 unzip -q full-src.zip
-cp -r "$QUALIFIER"u-*/src/java.base/share/classes java.base
-cp -r "$QUALIFIER"u-*/src/java.desktop/share/classes java.desktop
+cp -r jdk-*/src/java.base/share/classes java.base
+cp -r jdk-*/src/java.desktop/share/classes java.desktop
 zip -qr $DEST java.base java.desktop
-rm -rf java.base java.desktop "$QUALIFIER"u- full-src.zip
+rm -rf java.base java.desktop jdk-* full-src.zip

Makefile

@@ -22,16 +22,16 @@ base-src-jdk8.zip:
 	touch $@
 
 base-src-jdk11.zip:
-	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk11u/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
+	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
 
 base-src-jdk17.zip:
-	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk17u/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
+	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
 
 base-src-jdk21.zip:
-	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
+	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
 
-base-src-jdk23.zip:
-	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk23u/archive/refs/tags/jdk-23.0.1+11.zip jdk23 $@
+base-src-jdk24.zip:
+	bash .circleci/download-jdk-sources.sh https://github.com/adoptium/jdk/archive/refs/tags/jdk-24+36.zip jdk24 $@
 
 copy-sources-to-jdk: base-src-$(JDK_SRC_VERSION).zip
 	mkdir -p $(JAVA_HOME)/lib && cp base-src-$(JDK_SRC_VERSION).zip $(JAVA_HOME)/lib/src.zip