Merge branch 'java21' into jmh_params

ponder-lab · Oct 10, 2024 · c7c930e · c7c930e
2 parents e8fe404 + cabfa66
commit c7c930e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile
@@ -20,7 +20,7 @@ ARG arch=amd64
 ARG python=3.9
 FROM ${repo}:${arch}-conda-python-${python}
 
-ARG jdk=11
+ARG jdk=21
 ARG maven=3.8.7
 RUN mamba install -q -y \
         maven=${maven} \

diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile
@@ -33,7 +33,7 @@ RUN vcpkg install \
         --x-feature=s3
 
 # Install Java
-ARG java=11
+ARG java=21
 ARG maven=3.9.3
 RUN yum install -y java-$java-openjdk-devel && \
       yum clean all && \

diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
@@ -19,7 +19,7 @@ ARG base
 FROM ${base}
 
 ARG r=4.4
-ARG jdk=11
+ARG jdk=21
 
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium