Skip to content

Commit

Permalink
apacheGH-38051: [Java] Change minimum java versions for github actions
Browse files Browse the repository at this point in the history
Remove build support for Java 8 and make Java 11 the minimum version to
use to build Arrow in github actions and ci tasks
  • Loading branch information
laurentgo committed Jul 10, 2024
1 parent 5e451d8 commit 48a33a4
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ GCC_VERSION=""
GO=1.21.8
STATICCHECK=v0.4.7
HDFS=3.2.1
JDK=8
JDK=11
KARTOTHEK=latest
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
LLVM=14
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [8, 11, 17, 21, 22]
jdk: [11, 17, 21, 22]
maven: [3.9.6]
image: [java]
env:
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ARG arch=amd64
ARG maven=3.8.7
ARG node=16
ARG yarn=1.22
ARG jdk=8
ARG jdk=11
ARG go=1.21.8

# Install Archery and integration dependencies
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-python-hdfs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG arch=amd64
ARG python=3.8
FROM ${repo}:${arch}-conda-python-${python}

ARG jdk=8
ARG jdk=11
ARG maven=3.8.7
RUN mamba install -q -y \
maven=${maven} \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-python-spark.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG arch=amd64
ARG python=3.8
FROM ${repo}:${arch}-conda-python-${python}

ARG jdk=8
ARG jdk=11
ARG maven=3.8.7

ARG numpy=latest
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/java-jni-manylinux-201x.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN vcpkg install \
--x-feature=s3

# Install Java
ARG java=1.8.0
ARG java=11
ARG maven=3.9.3
RUN yum install -y java-$java-openjdk-devel && \
yum clean all && \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/linux-apt-docs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ARG base
FROM ${base}

ARG r=4.4
ARG jdk=8
ARG jdk=11

ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium

Expand Down
6 changes: 3 additions & 3 deletions dev/conbench_envs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ Here are steps how `@ursabot` benchmark builds use `benchmarks.env` and `hooks.s

### 2. Install Arrow dependencies for Java
sudo su
apt-get install openjdk-8-jdk
apt-get install openjdk-11-jdk
apt-get install maven

Verify that you have at least these versions of `java`, `javac` and `maven`:

# java -version
openjdk version "1.8.0_292"
openjdk version "11.0.22" 2024-01-16
..
# javac -version
javac 1.8.0_292
javac 11.0.22
...
# mvn -version
Apache Maven 3.6.3
Expand Down
4 changes: 3 additions & 1 deletion dev/release/setup-rhel-rebuilds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dnf -y install \
cmake \
git \
gobject-introspection-devel \
java-1.8.0-openjdk-devel \
java-11-openjdk-devel \
libcurl-devel \
llvm-devel \
llvm-toolset \
Expand All @@ -55,3 +55,5 @@ npm install -g yarn

python3 -m ensurepip --upgrade
alternatives --set python /usr/bin/python3
alternatives --set java java-11-openjdk.$(uname -i)
alternatives --set javac java-11-openjdk.$(uname -i)
2 changes: 1 addition & 1 deletion dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# Requirements
# - Ruby >= 2.3
# - Maven >= 3.8.7
# - JDK >=8
# - JDK >= 11
# - gcc >= 4.8
# - Node.js >= 18
# - Go >= 1.21
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1552,8 +1552,8 @@ tasks:
image: conda-python-hdfs
{% endfor %}

{% for python_version, spark_version, test_pyarrow_only, numpy_version, jdk_version in [("3.8", "v3.5.0", "false", "latest", "8"),
("3.10", "v3.5.0", "false", "1.23", "8"),
{% for python_version, spark_version, test_pyarrow_only, numpy_version, jdk_version in [("3.8", "v3.5.0", "false", "latest", "11"),
("3.10", "v3.5.0", "false", "1.23", "11"),
("3.11", "master", "false", "latest", "17")] %}
test-conda-python-{{ python_version }}-spark-{{ spark_version }}:
ci: github
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ services:
build:
args:
base: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
java: 1.8.0
java: 11
context: .
dockerfile: ci/docker/java-jni-manylinux-201x.dockerfile
cache_from:
Expand Down Expand Up @@ -1747,7 +1747,7 @@ services:
# docker-compose run java
# Parameters:
# MAVEN: 3.9.5
# JDK: 8, 11, 17, 21
# JDK: 11, 17, 21
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
shm_size: *shm-size
volumes: &java-volumes
Expand Down

0 comments on commit 48a33a4

Please sign in to comment.