From d5ec26ed84662e735a09d0c34db6c14f07ba3e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 30 Sep 2026 15:01:31 +0200 Subject: [PATCH 1/5] Dummy commit to test CI From ec3613ebccc588cdc104b13c270e89961f262c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 1 Oct 2026 14:04:10 +0200 Subject: [PATCH 2/5] Link ArrowS3 into dataset JNI library when available --- dataset/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dataset/CMakeLists.txt b/dataset/CMakeLists.txt index 348850c3be..4e066ab11b 100644 --- a/dataset/CMakeLists.txt +++ b/dataset/CMakeLists.txt @@ -17,6 +17,9 @@ find_package(ArrowDataset REQUIRED) find_package(ArrowSubstrait REQUIRED) +# S3 support lives in its own library in recent Arrow C++ (apache/arrow GH-50194). Older +# versions bundle it into libarrow and don't provide the ArrowS3 package. +find_package(ArrowS3 QUIET) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${JNI_INCLUDE_DIRS} ${JNI_HEADERS_DIR}) @@ -39,6 +42,9 @@ target_link_libraries(arrow_java_jni_dataset jni ArrowDataset::arrow_dataset_static ArrowSubstrait::arrow_substrait_static) +if(ArrowS3_FOUND) + target_link_libraries(arrow_java_jni_dataset ArrowS3::arrow_s3_static) +endif() if(BUILD_TESTING) add_executable(arrow-java-jni-dataset-test src/main/cpp/jni_util_test.cc From df995703b3d6435a7f89942dcecf2b567acb3c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 1 Oct 2026 15:37:08 +0200 Subject: [PATCH 3/5] Use macos-15 runner for JNI macOS build to get prebuilt LLVM bottle --- .github/workflows/rc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 15d4177255..b3b1a39a37 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -162,7 +162,7 @@ jobs: fail-fast: false matrix: platform: - - { runs_on: macos-14, arch: "aarch_64" } + - { runs_on: macos-15, arch: "aarch_64" } env: MACOSX_DEPLOYMENT_TARGET: "14.0" steps: From c6506d1d10d5694ea048a99f6fd79d8ab06e5cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 1 Oct 2026 16:17:29 +0200 Subject: [PATCH 4/5] Use bundled uriparser for JNI macOS build --- ci/scripts/jni_macos_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/scripts/jni_macos_build.sh b/ci/scripts/jni_macos_build.sh index c0040cb030..efc2446752 100755 --- a/ci/scripts/jni_macos_build.sh +++ b/ci/scripts/jni_macos_build.sh @@ -75,6 +75,7 @@ cmake \ --preset=ninja-release-jni-macos \ -Dabsl_SOURCE=BUNDLED \ -Dsimdjson_SOURCE=BUNDLED \ + -Duriparser_SOURCE=BUNDLED \ -DCMAKE_INSTALL_PREFIX="${install_dir}" cmake --build "${build_dir}/cpp" --target install github_actions_group_end From 2a465b9c2ed9b0beba2d979beb89fd90132a61bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 1 Oct 2026 17:21:29 +0200 Subject: [PATCH 5/5] Require ArrowS3 for Arrow C++ >= 26.0.0 --- dataset/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dataset/CMakeLists.txt b/dataset/CMakeLists.txt index 4e066ab11b..c8beb370af 100644 --- a/dataset/CMakeLists.txt +++ b/dataset/CMakeLists.txt @@ -17,9 +17,11 @@ find_package(ArrowDataset REQUIRED) find_package(ArrowSubstrait REQUIRED) -# S3 support lives in its own library in recent Arrow C++ (apache/arrow GH-50194). Older -# versions bundle it into libarrow and don't provide the ArrowS3 package. -find_package(ArrowS3 QUIET) +# S3 support lives in its own library since Arrow C++ 26.0.0 (apache/arrow GH-50194). +# Older versions bundle it into libarrow and don't provide the ArrowS3 package. +if(ARROW_VERSION VERSION_GREATER_EQUAL 26.0.0) + find_package(ArrowS3 REQUIRED) +endif() include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${JNI_INCLUDE_DIRS} ${JNI_HEADERS_DIR})