diff --git a/.env b/.env
index d3e1c1d63..a7783537d 100644
--- a/.env
+++ b/.env
@@ -40,7 +40,7 @@ ARCH_SHORT=amd64
# Default repository to pull and push images from
REPO=ghcr.io/apache/arrow-java-dev
-ARROW_REPO=apache/arrow-dev
+ARROW_REPO=ghcr.io/apache/arrow-dev
# The setup attempts to generate coredumps by default, in order to disable the
# coredump generation set it to 0
@@ -53,5 +53,4 @@ MAVEN=3.9.9
# Versions for various dependencies used to build artifacts
# Keep in sync with apache/arrow
ARROW_REPO_ROOT=./arrow
-PYTHON=3.9
-VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
+VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
index eec334409..3c69d580b 100644
--- a/.github/workflows/rc.yml
+++ b/.github/workflows/rc.yml
@@ -168,7 +168,7 @@ jobs:
fail-fast: false
matrix:
platform:
- - { runs_on: macos-13, arch: "x86_64"}
+ - { runs_on: macos-15-intel, arch: "x86_64"}
- { runs_on: macos-14, arch: "aarch_64" }
env:
MACOSX_DEPLOYMENT_TARGET: "14.0"
@@ -222,7 +222,7 @@ jobs:
brew uninstall llvm || :
# We can remove this when we drop support for
- # macos-13. because macos-14 or later uses /opt/homebrew/
+ # macos-15-initel. because macos-14 or later with arm64 uses /opt/homebrew/
# not /usr/local/.
#
# Ensure updating python@XXX with the "--overwrite" option.
diff --git a/ci/docker/vcpkg-jni.dockerfile b/ci/docker/vcpkg-jni.dockerfile
index 55fa35e0d..d6bd322a3 100644
--- a/ci/docker/vcpkg-jni.dockerfile
+++ b/ci/docker/vcpkg-jni.dockerfile
@@ -18,24 +18,10 @@
ARG base
FROM ${base}
-# Install the libraries required by Gandiva to run
-# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
-RUN vcpkg install \
- --clean-after-build \
- --x-install-root=${VCPKG_ROOT}/installed \
- --x-manifest-root=/arrow/ci/vcpkg \
- --x-feature=dev \
- --x-feature=flight \
- --x-feature=gcs \
- --x-feature=json \
- --x-feature=parquet \
- --x-feature=gandiva \
- --x-feature=s3
-
# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
ARG java=11
-RUN yum install -y java-$java-openjdk-devel && yum clean all
+RUN dnf install -y java-$java-openjdk-devel && dnf clean all
# For ci/scripts/{cpp,java}_*.sh
ENV ARROW_HOME=/tmp/local \
diff --git a/ci/scripts/jni_macos_build.sh b/ci/scripts/jni_macos_build.sh
index f7543b6f7..7f927d193 100755
--- a/ci/scripts/jni_macos_build.sh
+++ b/ci/scripts/jni_macos_build.sh
@@ -142,6 +142,7 @@ github_actions_group_begin "Checking shared dependencies for libraries"
pushd "${dist_dir}"
archery linking check-dependencies \
--allow CoreFoundation \
+ --allow Network \
--allow Security \
--allow libSystem \
--allow libarrow_cdata_jni \
diff --git a/compose.yaml b/compose.yaml
index b125c3c98..7e9c45d15 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -92,14 +92,14 @@ services:
# Usage:
# docker compose build vcpkg-jni
# docker compose run vcpkg-jni
- image: ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
+ image: ${REPO}:${ARCH}-vcpkg-jni-${PYTHON}-${VCPKG}
build:
context: .
dockerfile: ci/docker/vcpkg-jni.dockerfile
cache_from:
- - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
+ - ${REPO}:${ARCH}-vcpkg-jni-${PYTHON}-${VCPKG}
args:
- base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
+ base: ${ARROW_REPO}:${ARCH}-cpp-jni-${VCPKG}
volumes:
- .:/arrow-java:delegated
- ${ARROW_REPO_ROOT}:/arrow:delegated
diff --git a/pom.xml b/pom.xml
index 49e0c47c6..f6c9053db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache
apache
- 34
+ 35
org.apache.arrow
@@ -91,6 +91,7 @@ under the License.
+ 1695310533
${project.build.directory}/generated-sources
1.9.0
5.12.2
@@ -123,6 +124,8 @@ under the License.
3.2.2