diff --git a/.env b/.env index ca77b9441d7..440f6e4c00b 100644 --- a/.env +++ b/.env @@ -62,8 +62,8 @@ CMAKE=3.26.0 CUDA=11.7.1 DASK=latest GCC= -HDFS=3.2.1 -JDK=11 +HDFS=3.5.0 +JDK=17 # LLVM 12 and GCC 11 reports -Wmismatched-new-delete. LLVM=18 MAVEN=3.9.9 diff --git a/ci/docker/conda-python-hdfs.dockerfile b/ci/docker/conda-python-hdfs.dockerfile index 85311c8fa1f..d1c981953b2 100644 --- a/ci/docker/conda-python-hdfs.dockerfile +++ b/ci/docker/conda-python-hdfs.dockerfile @@ -21,7 +21,7 @@ ARG arch_short ARG python=3.11 FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python} -ARG jdk=11 +ARG jdk=17 ARG maven=3.9.9 RUN mamba install -q -y \ maven=${maven} \ @@ -30,7 +30,7 @@ RUN mamba install -q -y \ mamba clean --all --yes # installing libhdfs (JNI) -ARG hdfs=3.2.1 +ARG hdfs=3.5.0 ENV HADOOP_HOME=/opt/hadoop-${hdfs} \ HADOOP_OPTS=-Djava.library.path=/opt/hadoop-${hdfs}/lib/native \ PATH=$PATH:/opt/hadoop-${hdfs}/bin:/opt/hadoop-${hdfs}/sbin diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile index d7e74f08ee6..8267c690474 100644 --- a/ci/docker/conda-python-spark.dockerfile +++ b/ci/docker/conda-python-spark.dockerfile @@ -21,7 +21,7 @@ ARG arch_short ARG python=3.11 FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-python-${python} -ARG jdk=11 +ARG jdk=17 ARG maven=3.9.9 ARG numpy=latest diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 1a22c791559..649d3793cdd 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -771,7 +771,7 @@ tasks: image: conda-python-dask {% endfor %} -{% for hdfs_version in ["2.9.2", "3.2.1"] %} +{% for hdfs_version in ["2.10.2", "3.5.0"] %} test-conda-python-3.11-hdfs-{{ hdfs_version }}: ci: github template: docker-tests/github.linux.yml