Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ JDK=8
KARTOTHEK=latest
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
LLVM=14
MAVEN=3.5.4
MAVEN=3.9.6
NODE=18
NUMBA=latest
NUMPY=latest
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
fail-fast: false
matrix:
jdk: [8, 11, 17, 21]
maven: [3.9.5]
maven: [3.9.6]
image: [java]
env:
JDK: ${{ matrix.jdk }}
Expand Down Expand Up @@ -133,12 +133,18 @@ jobs:
fail-fast: false
matrix:
jdk: [11]
maven: [3.9.6]
steps:
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
- name: Set up Maven
uses: s4u/setup-maven-action@1.9.0
with:
java-version: ${{ matrix.jdk }}
maven-version: ${{ matrix.maven }}
- name: Checkout Arrow
uses: actions/checkout@v4
with:
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 @@ -20,7 +20,7 @@ ARG arch=amd64
FROM ${repo}:${arch}-conda-cpp

ARG arch=amd64
ARG maven=3.5
ARG maven=3.9.6
ARG node=16
ARG yarn=1.22
ARG jdk=8
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 @@ -21,7 +21,7 @@ ARG python=3.8
FROM ${repo}:${arch}-conda-python-${python}

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

ARG jdk=11
ARG maven=3.6
ARG maven=3.9.6
RUN mamba install -q -y \
maven=${maven} \
openjdk=${jdk} \
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 @@ -21,7 +21,7 @@ ARG python=3.8
FROM ${repo}:${arch}-conda-python-${python}

ARG jdk=8
ARG maven=3.5
ARG maven=3.9.6

ARG numpy=latest
COPY ci/scripts/install_numpy.sh /arrow/ci/scripts/
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 @@ -34,7 +34,7 @@ RUN vcpkg install \

# Install Java
ARG java=1.8.0
ARG maven=3.9.3
ARG maven=3.9.6
RUN yum install -y java-$java-openjdk-devel && \
yum clean all && \
curl \
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 @@ -60,7 +60,7 @@ RUN apt-get update -y && \

ENV JAVA_HOME=/usr/lib/jvm/java-${jdk}-openjdk-amd64

ARG maven=3.5.4
ARG maven=3.9.6
COPY ci/scripts/util_download_apache.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/util_download_apache.sh \
"maven/maven-3/${maven}/binaries/apache-maven-${maven}-bin.tar.gz" /opt
Expand Down
2 changes: 1 addition & 1 deletion dev/conbench_envs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Verify that you have at least these versions of `java`, `javac` and `maven`:
javac 1.8.0_292
...
# mvn -version
Apache Maven 3.6.3
Apache Maven 3.9.6
...

### 3. Install Arrow dependencies for Java Script
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/verify-rc/github.linux.amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ jobs:
with:
ruby-version: 3.1

- uses: actions/setup-java@v2
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '11'
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,7 @@ services:
# docker-compose build java
# docker-compose run java
# Parameters:
# MAVEN: 3.9.5
# MAVEN: 3.9.6
# JDK: 8, 11, 17, 21
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
shm_size: *shm-size
Expand Down Expand Up @@ -1707,10 +1707,10 @@ services:
repo: ${REPO}
arch: ${ARCH}
# Use a newer JDK as it seems to improve stability
jdk: 17
jdk: 11
# conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
# be set to ${MAVEN}
maven: 3.5
maven: 3.9.6
node: ${NODE}
go: ${GO}
volumes: *conda-volumes
Expand Down Expand Up @@ -1844,7 +1844,7 @@ services:
jdk: ${JDK}
# conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
# be set to ${MAVEN}
maven: 3.5
maven: 3.9.6
hdfs: ${HDFS}
links:
- impala:impala
Expand Down Expand Up @@ -1887,7 +1887,7 @@ services:
jdk: ${JDK}
# conda-forge doesn't have 3.5.4 so pinning explicitly, but this should
# be set to ${MAVEN}
maven: 3.5
maven: 3.9.6
spark: ${SPARK}
numpy: ${NUMPY}
shm_size: *shm-size
Expand Down
2 changes: 1 addition & 1 deletion java/maven/module-info-compiler-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</prerequisites>

<properties>
<maven.version>3.3.9</maven.version>
<maven.version>3.9.6</maven.version>
</properties>

<dependencies>
Expand Down