From 066f2ee8e4a0077d5b52cdbe04d53cf3770b9733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= Date: Wed, 30 Sep 2026 09:29:49 +0100 Subject: [PATCH 1/3] CI: Link ArrowS3 for dataset JNI Link the static ArrowS3 target when S3 is enabled so EnsureS3Finalized resolves after Arrow moved S3 and the AWS SDK out of libarrow. --- dataset/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dataset/CMakeLists.txt b/dataset/CMakeLists.txt index 348850c3be..99bf2603f5 100644 --- a/dataset/CMakeLists.txt +++ b/dataset/CMakeLists.txt @@ -17,6 +17,9 @@ find_package(ArrowDataset REQUIRED) find_package(ArrowSubstrait REQUIRED) +if(ARROW_S3) + find_package(ArrowS3 REQUIRED) +endif() 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(ARROW_S3) + 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 efb18634aa322fcc48743c8adf7b570e1555a10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= Date: Wed, 30 Sep 2026 09:33:58 +0100 Subject: [PATCH 2/3] CI: Support older Arrow S3 packages Probe ArrowS3 without requiring its package config so JNI builds continue to work with Arrow releases predating the S3 library split. Link the static target when it is available. --- dataset/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataset/CMakeLists.txt b/dataset/CMakeLists.txt index 99bf2603f5..a77312b8da 100644 --- a/dataset/CMakeLists.txt +++ b/dataset/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(ArrowDataset REQUIRED) find_package(ArrowSubstrait REQUIRED) if(ARROW_S3) - find_package(ArrowS3 REQUIRED) + find_package(ArrowS3 QUIET) endif() include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} @@ -42,7 +42,7 @@ target_link_libraries(arrow_java_jni_dataset jni ArrowDataset::arrow_dataset_static ArrowSubstrait::arrow_substrait_static) -if(ARROW_S3) +if(TARGET ArrowS3::arrow_s3_static) target_link_libraries(arrow_java_jni_dataset ArrowS3::arrow_s3_static) endif() From b62237c78d84c17fbb409326ad1cc6ceae3b547c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= Date: Wed, 30 Sep 2026 23:30:08 +0100 Subject: [PATCH 3/3] CMake: Require ArrowS3 for Arrow 26+ --- dataset/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataset/CMakeLists.txt b/dataset/CMakeLists.txt index a77312b8da..bbefc14a54 100644 --- a/dataset/CMakeLists.txt +++ b/dataset/CMakeLists.txt @@ -17,8 +17,8 @@ find_package(ArrowDataset REQUIRED) find_package(ArrowSubstrait REQUIRED) -if(ARROW_S3) - find_package(ArrowS3 QUIET) +if(ARROW_S3 AND ARROW_VERSION VERSION_GREATER_EQUAL 26.0.0) + find_package(ArrowS3 REQUIRED) endif() include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}