Support building JDK 21; update CodeQL CLI to 2.15.5

Author: Marcono1234

Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y instal
     libfontconfig1-dev
 
 # Install boot JDK
-ARG BOOT_JDK_URL="https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2+7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz"
+ARG BOOT_JDK_URL="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz"
 RUN apt-get -y install ca-certificates \
     && wget --no-verbose "${BOOT_JDK_URL}" --output-document=boot-jdk.tar.gz \
     && mkdir boot-jdk \
@@ -29,7 +29,7 @@ RUN apt-get -y install ca-certificates \
     && rm boot-jdk.tar.gz
 
 # Set up CodeQL CLI
-ARG CODEQL_CLI_VERSION=2.12.6
+ARG CODEQL_CLI_VERSION=2.15.5
 RUN apt-get -y install ca-certificates \
     && wget --no-verbose "https://github.com/github/codeql-cli-binaries/releases/download/v${CODEQL_CLI_VERSION}/codeql-linux64.zip" --output-document=codeql-linux64.zip \
     && unzip -q -d codeql-cli codeql-linux64.zip \
@@ -40,4 +40,4 @@ RUN apt-get -y install ca-certificates \
 COPY ./docker_scripts/* ./docker_scripts/
 
 ENTRYPOINT ["./docker_scripts/create_database.sh"]
-CMD ["--jdk-git-repo", "https://github.com/openjdk/jdk20u"]
+CMD ["--jdk-git-repo", "https://github.com/openjdk/jdk21u"]

README.md

@@ -21,7 +21,7 @@ This project provides convenience scripts for creating a CodeQL database for the
 - Windows: [`build_database.cmd`](./build_database.cmd)
 - Linux: [`build_database.sh`](./build_database.sh)
 
-At the moment they use CodeQL CLI 2.12.6 and build a Java database for the latest <https://github.com/openjdk/jdk20u> commit.
+At the moment they use CodeQL CLI 2.15.5 and build a Java database for the latest <https://github.com/openjdk/jdk21u> commit.
 
 The scripts only build the Linux variant of the JDK, building the Windows variant is currently not supported.
 

jdk-versions/README.md

@@ -5,7 +5,10 @@ This directory contains convenience build scripts for creating databases for the
 - `jdk8u`: Cloned from [adoptium/jdk8u](https://github.com/adoptium/jdk8u)
 - `jdk11u`: Cloned from [openjdk/jdk11u](https://github.com/openjdk/jdk11u)
 - `jdk17u`: Cloned from [openjdk/jdk17u](https://github.com/openjdk/jdk17u)
-- _latest release_: Cloned from [openjdk/jdk20u](https://github.com/openjdk/jdk20u)
+- `jdk21u`: Cloned from [openjdk/jdk21u](https://github.com/openjdk/jdk21u)
+<!--
+- _latest release_: Cloned from [openjdk/jdk22u](https://github.com/openjdk/jdk22u)
+-->
 
 The build scripts support the command line arguments for tweaking build performance, as [specified by the README](/README.md#build-configuration).
 

jdk-versions/jdk-21-linux.cmd

@@ -0,0 +1,5 @@
+@REM Create output directory; abort if directory cannot be created (e.g. when file with this name exists)
+IF NOT EXIST "databases/" mkdir databases || EXIT 1
+
+@REM Build image, then start container (with `--rm` to remove it once finished)
+docker build .. -t codeql-jdk:21-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz && docker container run --rm --name "codeql-jdk-21-linux-db-build" --mount type=bind,source="%cd%/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:21-linux --jdk-git-repo https://github.com/openjdk/jdk21u --jdk-version-name 21-linux %*

jdk-versions/jdk-21-linux.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Create output directory
+mkdir -p databases
+# Build image, then start container (with `--rm` to remove it once finished)
+docker build .. -t codeql-jdk:21-linux --build-arg BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz
+docker container run --rm --name "codeql-jdk-21-linux-db-build" --mount type=bind,source="$(pwd)/databases",target=/codeql-jdk/codeql-jdk-databases codeql-jdk:21-linux --jdk-git-repo https://github.com/openjdk/jdk21u --jdk-version-name 21-linux "$@"