diff --git a/.env b/.env index d3e1c1d63..5606f73aa 100644 --- a/.env +++ b/.env @@ -53,5 +53,5 @@ 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 +PYTHON=3.12 VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release diff --git a/compose.yaml b/compose.yaml index b125c3c98..0a4fd13c9 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}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${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