Bump SQL server JDK from Temurin 20 (EOL) to 21 LTS

.github/workflows/codeql.yml

@@ -33,12 +33,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up JDK 20
+    - name: Set up JDK 21
       if: matrix.language == 'java-kotlin'
       uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: '20'
+        java-version: '21'
 
     - name: Install clang-20
       if: matrix.language == 'c-cpp'

sql/Dockerfile

@@ -2,7 +2,11 @@ FROM skiplabs/skip AS base
 
 ARG TARGETARCH
 
-# Install system deps, Java 20 (Adoptium Temurin), and Gradle 9.3.1
+# Install system deps, Java 21 (Adoptium Temurin), and Gradle 9.3.1.
+# The .sdkman stub dirs below are a build-time sentinel that lets
+# sql/ts/tests/service_common.mk skip its SDKMAN install (Java here comes
+# from apt above). Its version string only has to match that Makefile — it
+# does not track the JDK version and is intentionally left at 20.0.2-tem.
 RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,id=apt-lists-$TARGETARCH,target=/var/lib/apt/lists,sharing=locked \
     --mount=type=cache,target=/root/.npm,sharing=locked \
@@ -11,7 +15,7 @@ RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt,sharing=lo
     echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(. /etc/os-release && echo $VERSION_CODENAME) main" \
       > /etc/apt/sources.list.d/adoptium.list && \
     apt-get update && \
-    apt-get install -q -y --no-install-recommends curl sqlite3 unzip zip temurin-20-jdk && \
+    apt-get install -q -y --no-install-recommends curl sqlite3 unzip zip temurin-21-jdk && \
     npm install -g bun && \
     npx playwright install-deps && \
     curl -sL https://services.gradle.org/distributions/gradle-9.3.1-bin.zip -o /tmp/gradle.zip && \
@@ -23,7 +27,7 @@ RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt,sharing=lo
       /root/.sdkman/candidates/gradle && \
     touch /root/.sdkman/bin/sdkman-init.sh
 
-ENV JAVA_HOME=/usr/lib/jvm/temurin-20-jdk-${TARGETARCH}
+ENV JAVA_HOME=/usr/lib/jvm/temurin-21-jdk-${TARGETARCH}
 
 FROM base AS skdb
 

sql/server/core/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:20
+FROM eclipse-temurin:21
 
 # Copy Gradle wrapper and build configs first (changes rarely)
 COPY sql/server/gradlew sql/server/gradle.properties /skdb/sql/server/

sql/server/core/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
-java { toolchain { languageVersion.set(JavaLanguageVersion.of(20)) } }
+java { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
 
 tasks.named<Test>("test") {
   // Use JUnit Platform for unit tests.

sql/server/dev/Dockerfile

@@ -1,5 +1,5 @@
 FROM skiplabs/skdb AS skdb
-FROM eclipse-temurin:20 AS skgw
+FROM eclipse-temurin:21 AS skgw
 
 # Copy Gradle wrapper and build configs first (changes rarely)
 COPY sql/server/gradlew sql/server/gradle.properties /skdb/sql/server/
@@ -26,7 +26,7 @@ RUN --mount=type=cache,target=/root/.gradle,sharing=locked \
 # Build the development image by copying out artifacts
 ################################################################################
 
-FROM eclipse-temurin:20 AS dev
+FROM eclipse-temurin:21 AS dev
 
 WORKDIR /skdb
 

sql/server/pg/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
-java { toolchain { languageVersion.set(JavaLanguageVersion.of(20)) } }
+java { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
 
 spotless { kotlin { ktfmt("0.49") } }