You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2025/09/18 05:21:07 UTC
(arrow-adbc) branch main updated: ci: build JNI artifacts (#3429)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 477ccf068 ci: build JNI artifacts (#3429)
477ccf068 is described below
commit 477ccf06854542d56bbcd33fe9f4c098797a75de
Author: David Li <li...@gmail.com>
AuthorDate: Thu Sep 18 14:21:02 2025 +0900
ci: build JNI artifacts (#3429)
Closes #2689.
---------
Co-authored-by: Sutou Kouhei <ko...@cozmixng.org>
---
.github/workflows/java.yml | 7 +-
.github/workflows/packaging.yml | 71 +++++-
ci/scripts/java_build.sh | 1 +
compose.yaml | 3 +-
java/CMakeLists.txt | 2 +-
.../driver/jni/src/main/resources/META-INF/LICENSE | 243 +++++++++++++++++++++
java/driver/jni/src/main/resources/META-INF/NOTICE | 5 +
7 files changed, 323 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index f9be0b003..47c1cf752 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -182,12 +182,7 @@ jobs:
if: failure()
run: |
mkdir ~/logs
- counter=0
- for log in $(find "$VCPKG_ROOT" -name 'build-*.log' -or -name 'config-*.log'); do
- echo cp "$log" ~/logs/$counter-$(basename "$log")
- cp "$log" ~/logs/$counter-$(basename "$log")
- counter=$((counter+1))
- done
+ find "$VCPKG_ROOT" -name 'build-*.log' -exec cp '{}' ~/logs ';'
- name: Upload failure logs
if: failure()
uses: actions/upload-artifact@v4
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index ffef1a639..de0fb1a93 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -249,16 +249,77 @@ jobs:
path: |
docs.tgz
+ java-jni:
+ name: "JNI Libraries/${{ matrix.os }} ${{ matrix.arch }}"
+ needs:
+ - source
+ runs-on: ${{ matrix.runner }}
+ strategy:
+ matrix:
+ include:
+ - { os: Linux, arch: amd64, runner: ubuntu-latest }
+ - { os: Linux, arch: arm64, runner: ubuntu-24.04-arm }
+ - { os: macOS, arch: arm64v8, runner: macos-latest }
+ - { os: Windows, arch: amd64, runner: windows-latest }
+
+ steps:
+ - uses: actions/download-artifact@v5
+ with:
+ name: source
+ - name: Extract source archive
+ run: |
+ source_archive=$(echo apache-arrow-adbc-*.tar.gz)
+ VERSION=${source_archive#apache-arrow-adbc-}
+ VERSION=${VERSION%.tar.gz}
+ echo "VERSION=${VERSION}" >> $GITHUB_ENV
+
+ tar xf apache-arrow-adbc-${VERSION}.tar.gz
+ mv apache-arrow-adbc-${VERSION} adbc
+ - name: Build JNI artifacts
+ working-directory: adbc
+ emv:
+ ADBC_BUILD_STATIC: ON
+ ADBC_BUILD_TESTS: OFF
+ ADBC_USE_ASAN: OFF
+ ADBC_USE_UBSAN: OFF
+ BUILD_ALL: 0
+ BUILD_DRIVER_MANAGER: 1
+ CMAKE_BUILD_TYPE: release
+ run: |
+ ./ci/scripts/cpp_build.sh $(pwd) $(pwd)/build_driver_manager
+ ./ci/scripts/java_build.sh $(pwd)
+ ./ci/scripts/java_jni_build.sh $(pwd) $(pwd)/build_jni $(pwd)/build_driver_manager/local
+ - name: Assemble artifacts
+ run: |
+ mkdir artifacts
+ cp -r adbc/java/driver/jni/src/main/resources/ artifacts/jni
+ ls -laR artifacts
+ mv artifacts artifacts-${{ matrix.os }}-${{ matrix.arch }}
+ tar czf artifacts-${{ matrix.os }}-${{ matrix.arch }}.tgz artifacts-${{ matrix.os }}-${{ matrix.arch }}
+ - uses: actions/upload-artifact@v4
+ with:
+ name: jni-artifacts-${{ matrix.os }}-${{ matrix.arch }}
+ retention-days: 7
+ path: |
+ artifacts-${{ matrix.os }}-${{ matrix.arch }}.tgz
+
java:
name: "Java 11"
runs-on: ubuntu-latest
needs:
- source
+ - java-jni
steps:
- uses: actions/download-artifact@v5
with:
name: source
+ - uses: actions/download-artifact@v5
+ with:
+ path: artifacts
+ pattern: jni-artifacts-*
+ merge-multiple: true
+
- name: Extract source archive
run: |
source_archive=$(echo apache-arrow-adbc-*.tar.gz)
@@ -277,8 +338,16 @@ jobs:
- name: Build and test
run: |
+ set -x
+ pushd artifacts
+ for archive in artifacts*.tgz; do
+ tar xvf $archive
+ done
+ popd
+ cp -r artifacts/*/jni/adbc_driver_jni adbc/java/driver/jni/src/main/resources
+
pushd adbc/
- docker compose run java-dist
+ docker compose run -e BUILD_JNI=ON java-dist
popd
cp -a adbc/dist/ ./
diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
index 145178a04..3e7babdc8 100755
--- a/ci/scripts/java_build.sh
+++ b/ci/scripts/java_build.sh
@@ -37,6 +37,7 @@ main() {
local maven_profiles="apache-release"
if [[ "${BUILD_JNI}" == "ON" ]]; then
maven_profiles="${maven_profiles},jni"
+ echo "(*) Building JNI libraries"
fi
echo "=== Build ==="
diff --git a/compose.yaml b/compose.yaml
index 90713b8b6..5ff6cff33 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -92,7 +92,8 @@ services:
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
volumes:
- .:/adbc:delegated
- command: "/bin/bash -c '/adbc/ci/scripts/java_build.sh /adbc /adbc/dist && /adbc/ci/scripts/java_test.sh /adbc'"
+ # N.B. never run JNI tests as we won't have the drivers built
+ command: "/bin/bash -c '/adbc/ci/scripts/java_build.sh /adbc /adbc/dist && env BUILD_JNI=OFF /adbc/ci/scripts/java_test.sh /adbc'"
# Build the JNI and driver libraries
java-jni:
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index e4ae54ec3..34083624d 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
project(adbc-java)
if("${CMAKE_CXX_STANDARD}" STREQUAL "")
- set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD 20)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/java/driver/jni/src/main/resources/META-INF/LICENSE b/java/driver/jni/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000000000..9d0471922
--- /dev/null
+++ b/java/driver/jni/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,243 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--------------------------------------------------------------------------------
+
+The files in c/vendor/portable-snippets/ contain code from
+
+https://github.com/nemequ/portable-snippets
+
+and have the following copyright notice:
+
+Each source file contains a preamble explaining the license situation
+for that file, which takes priority over this file. With the
+exception of some code pulled in from other repositories (such as
+µnit, an MIT-licensed project which is used for testing), the code is
+public domain, released using the CC0 1.0 Universal dedication (*).
+
+(*) https://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+--------------------------------------------------------------------------------
+
+The files in c/vendor/toml++ contain code from
+
+https://github.com/marzer/tomlplusplus
+
+and have the following copyright notice:
+
+MIT License
+
+Copyright (c) Mark Gillard <ma...@outlook.com.au>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/java/driver/jni/src/main/resources/META-INF/NOTICE b/java/driver/jni/src/main/resources/META-INF/NOTICE
new file mode 100644
index 000000000..bc07e6dec
--- /dev/null
+++ b/java/driver/jni/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,5 @@
+Apache Arrow ADBC
+Copyright 2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).