@@ -22,7 +22,7 @@ arrow_dir=${1}
 source_dir=${1}/java
 build_dir=${2}
 cpp_build_dir=${build_dir}/cpp/${ARROW_BUILD_TYPE:-debug}
-cdata_dist_dir=${build_dir}/java/c
+java_jni_dist_dir=${3}
 
 : ${BUILD_DOCS_JAVA:=OFF}
 
@@ -76,7 +76,7 @@ if [ "${ARROW_JAVA_SHADE_FLATBUFFERS}" == "ON" ]; then
 fi
 
 if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then
-  ${mvn} -Darrow.c.jni.dist.dir=${cdata_dist_dir} -Parrow-c-data install
+  ${mvn} -Darrow.c.jni.dist.dir=${java_jni_dist_dir} -Parrow-c-data install
 fi
 
 if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then
 
@@ -20,7 +20,7 @@
 set -ex
 
 arrow_dir=${1}
-build_dir=${2}
+build_dir=${2}/java_jni
 # The directory where the final binaries will be stored when scripts finish
 dist_dir=${3}
 
@@ -34,12 +34,9 @@ pushd "${build_dir}"
 
 cmake \
   -DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-release} \
-  -DCMAKE_INSTALL_LIBDIR=lib \
-  -DCMAKE_INSTALL_PREFIX=${build_dir} \
-  ${arrow_dir}/java/c
+  -DCMAKE_INSTALL_PREFIX=${dist_dir} \
+  -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+  ${JAVA_JNI_CMAKE_ARGS:-} \
+  ${arrow_dir}/java
 cmake --build . --target install --config ${ARROW_BUILD_TYPE:-release}
 popd
-
-echo "=== Copying libraries to the distribution folder ==="
-mkdir -p "${dist_dir}"
-cp -L ${build_dir}/lib/*arrow_cdata_jni.* ${dist_dir}
@@ -46,30 +46,29 @@ export ARROW_TEST_DATA="${arrow_dir}/testing/data"
 export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
 export AWS_EC2_METADATA_DISABLED=TRUE
 
-mkdir -p "${build_dir}"
-pushd "${build_dir}"
+mkdir -p "${build_dir}/cpp"
+pushd "${build_dir}/cpp"
 
 cmake \
-  -GNinja \
   -DARROW_BOOST_USE_SHARED=OFF \
   -DARROW_BROTLI_USE_SHARED=OFF \
   -DARROW_BUILD_TESTS=${ARROW_BUILD_TESTS} \
   -DARROW_BUILD_UTILITIES=OFF \
   -DARROW_BZ2_USE_SHARED=OFF \
   -DARROW_DATASET=${ARROW_DATASET} \
   -DARROW_FILESYSTEM=${ARROW_FILESYSTEM} \
+  -DARROW_GANDIVA=${ARROW_GANDIVA} \
   -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA} \
   -DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
-  -DARROW_GANDIVA=${ARROW_GANDIVA} \
   -DARROW_GFLAGS_USE_SHARED=OFF \
   -DARROW_GRPC_USE_SHARED=OFF \
   -DARROW_JNI=ON \
   -DARROW_LZ4_USE_SHARED=OFF \
   -DARROW_OPENSSL_USE_SHARED=OFF \
   -DARROW_ORC=${ARROW_ORC} \
   -DARROW_PARQUET=${ARROW_PARQUET} \
-  -DARROW_PLASMA_JAVA_CLIENT=${ARROW_PLASMA_JAVA_CLIENT} \
   -DARROW_PLASMA=${ARROW_PLASMA} \
+  -DARROW_PLASMA_JAVA_CLIENT=${ARROW_PLASMA_JAVA_CLIENT} \
   -DARROW_PROTOBUF_USE_SHARED=OFF \
   -DARROW_PYTHON=${ARROW_PYTHON} \
   -DARROW_SNAPPY_USE_SHARED=OFF \
@@ -78,12 +77,13 @@ cmake \
   -DARROW_ZSTD_USE_SHARED=OFF \
   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
   -DCMAKE_INSTALL_LIBDIR=lib \
-  -DCMAKE_INSTALL_PREFIX=${build_dir} \
+  -DCMAKE_INSTALL_PREFIX=${build_dir}/cpp \
   -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \
   -DPARQUET_BUILD_EXAMPLES=OFF \
   -DPARQUET_BUILD_EXECUTABLES=OFF \
   -DPARQUET_REQUIRE_ENCRYPTION=OFF \
   -Dre2_SOURCE=BUNDLED \
+  -GNinja \
   ${arrow_dir}/cpp
 cmake --build . --target install
 
@@ -93,24 +93,33 @@ fi
 
 popd
 
+
+${arrow_dir}/ci/scripts/java_jni_build.sh \
+  ${arrow_dir} \
+  ${build_dir} \
+  ${dist_dir}
+
+
 echo "=== Copying libraries to the distribution folder ==="
 mkdir -p "${dist_dir}"
-cp -L ${build_dir}/lib/libgandiva_jni.dylib ${dist_dir}
-cp -L ${build_dir}/lib/libarrow_dataset_jni.dylib ${dist_dir}
-cp -L ${build_dir}/lib/libarrow_orc_jni.dylib ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libgandiva_jni.dylib ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libarrow_dataset_jni.dylib ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libarrow_orc_jni.dylib ${dist_dir}
 
 echo "=== Checking shared dependencies for libraries ==="
 
 pushd ${dist_dir}
 archery linking check-dependencies \
+  --allow libSystem \
+  --allow libarrow_cdata_jni \
   --allow libarrow_dataset_jni \
   --allow libarrow_orc_jni \
   --allow libc++ \
   --allow libgandiva_jni \
   --allow libncurses \
-  --allow libSystem \
   --allow libz \
-  libgandiva_jni.dylib \
+  libarrow_cdata_jni.dylib \
   libarrow_dataset_jni.dylib \
-  libarrow_orc_jni.dylib
+  libarrow_orc_jni.dylib \
+  libgandiva_jni.dylib
 popd
@@ -55,8 +55,8 @@ export ARROW_TEST_DATA="${arrow_dir}/testing/data"
 export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
 export AWS_EC2_METADATA_DISABLED=TRUE
 
-mkdir -p "${build_dir}"
-pushd "${build_dir}"
+mkdir -p "${build_dir}/cpp"
+pushd "${build_dir}/cpp"
 
 cmake \
   -DARROW_BOOST_USE_SHARED=OFF \
@@ -89,7 +89,7 @@ cmake \
   -DARROW_ZSTD_USE_SHARED=OFF \
   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
   -DCMAKE_INSTALL_LIBDIR=lib \
-  -DCMAKE_INSTALL_PREFIX=${build_dir} \
+  -DCMAKE_INSTALL_PREFIX=${build_dir}/cpp \
   -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \
   -DORC_SOURCE=BUNDLED \
   -DORC_PROTOBUF_EXECUTABLE=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc \
@@ -105,20 +105,30 @@ cmake \
 ninja install
 
 if [ $ARROW_BUILD_TESTS = "ON" ]; then
-    ctest \
-        --label-regex unittest \
-        --output-on-failure \
-        --parallel $(nproc) \
-        --timeout 300
+  ctest \
+    --label-regex unittest \
+    --output-on-failure \
+    --parallel $(nproc) \
+    --timeout 300
 fi
 
 popd
 
+
+JAVA_JNI_CMAKE_ARGS=""
+JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DVCPKG_MANIFEST_MODE=OFF"
+JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
+export JAVA_JNI_CMAKE_ARGS
+${arrow_dir}/ci/scripts/java_jni_build.sh \
+  ${arrow_dir} \
+  ${build_dir} \
+  ${dist_dir}
+
+
 echo "=== Copying libraries to the distribution folder ==="
-mkdir -p "${dist_dir}"
-cp -L ${build_dir}/lib/libgandiva_jni.so ${dist_dir}
-cp -L ${build_dir}/lib/libarrow_dataset_jni.so ${dist_dir}
-cp -L ${build_dir}/lib/libarrow_orc_jni.so ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libgandiva_jni.so ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libarrow_dataset_jni.so ${dist_dir}
+cp -L ${build_dir}/cpp/lib/libarrow_orc_jni.so ${dist_dir}
 
 echo "=== Checking shared dependencies for libraries ==="
 
@@ -134,7 +144,8 @@ archery linking check-dependencies \
   --allow libstdc++ \
   --allow libz \
   --allow linux-vdso \
-  libgandiva_jni.so \
+  libarrow_cdata_jni.so \
   libarrow_dataset_jni.so \
-  libarrow_orc_jni.so
+  libarrow_orc_jni.so \
+  libgandiva_jni.so
 popd
@@ -21,7 +21,7 @@ set -ex
 arrow_dir=${1}
 source_dir=${1}/java
 cpp_build_dir=${2}/cpp/${ARROW_BUILD_TYPE:-debug}
-cdata_dist_dir=${2}/java/c
+java_jni_dist_dir=${3}
 
 # For JNI and Plasma tests
 export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
@@ -40,7 +40,7 @@ if [ "${ARROW_JNI}" = "ON" ]; then
 fi
 
 if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then
-  ${mvn} test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir=${cdata_dist_dir}
+  ${mvn} test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir=${java_jni_dist_dir}
 fi
 
 if [ "${ARROW_PLASMA}" = "ON" ]; then
 
@@ -29,7 +29,7 @@ jobs:
       {{ macros.github_install_archery()|indent }}
       - name: Build C++ Libs
         run: archery docker run java-jni-manylinux-2014
-      - name: Compress into single artifact
+      - name: Compress into single artifact to keep directory structure
         run: tar -cvzf arrow-shared-libs-linux.tar.gz arrow/java-dist/
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
@@ -55,21 +55,14 @@ jobs:
         run: |
           brew install --overwrite git
           brew bundle --file=arrow/cpp/Brewfile
-      - name: Build C Data Interface lib
-        run: |
-          set -e
-          arrow/ci/scripts/java_cdata_build.sh \
-            $GITHUB_WORKSPACE/arrow \
-            $GITHUB_WORKSPACE/arrow/java-native-build \
-            $GITHUB_WORKSPACE/arrow/java-dist
       - name: Build C++ Libs
         run: |
           set -e
           arrow/ci/scripts/java_jni_macos_build.sh \
             $GITHUB_WORKSPACE/arrow \
             $GITHUB_WORKSPACE/arrow/cpp-build \
             $GITHUB_WORKSPACE/arrow/java-dist
-      - name: Compress into single artifact
+      - name: Compress into single artifact to keep directory structure
         run: tar -cvzf arrow-shared-libs-macos.tar.gz arrow/java-dist/
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
@@ -93,10 +86,11 @@ jobs:
           name: macos-shared-lib
       - name: Descompress artifacts
         run: |
-          tar -xvzf arrow-shared-libs-macos.tar.gz
           tar -xvzf arrow-shared-libs-linux.tar.gz
+          tar -xvzf arrow-shared-libs-macos.tar.gz
       - name: Test that Shared Libraries Exist
         run: |
+          set -x
           test -f arrow/java-dist/libarrow_cdata_jni.dylib
           test -f arrow/java-dist/libarrow_dataset_jni.dylib
           test -f arrow/java-dist/libgandiva_jni.dylib
 
@@ -964,7 +964,6 @@ services:
       - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2014-ccache:/ccache:delegated
     command:
       ["pip install -e /arrow/dev/archery &&
-        /arrow/ci/scripts/java_cdata_build.sh /arrow /java-native-build /arrow/java-dist &&
         /arrow/ci/scripts/java_jni_manylinux_build.sh /arrow /build /arrow/java-dist"]
 
   ##############################  Integration #################################
@@ -1117,16 +1116,19 @@ services:
       ARROW_ORC: "OFF"
       ARROW_PARQUET: "OFF"
       ARROW_PLASMA: "OFF"
+      JAVA_JNI_CMAKE_ARGS: >-
+        -DARROW_JAVA_JNI_ENABLE_DEFAULT=OFF
+        -DARROW_JAVA_JNI_ENABLE_C=ON
     volumes:
       - .:/arrow:delegated
       - ${DOCKER_VOLUME_PREFIX}maven-cache:/root/.m2:delegated
       - ${DOCKER_VOLUME_PREFIX}debian-ccache:/ccache:delegated
     command:
       [ "/arrow/ci/scripts/cpp_build.sh /arrow /build &&
           /arrow/ci/scripts/python_build.sh /arrow /build &&
-          /arrow/ci/scripts/java_cdata_build.sh /arrow /build/java/c/build /build/java/c &&
-          /arrow/ci/scripts/java_build.sh /arrow /build &&
-          /arrow/ci/scripts/java_cdata_integration.sh /arrow" ]
+          /arrow/ci/scripts/java_jni_build.sh /arrow /build /tmp/dist/java &&
+          /arrow/ci/scripts/java_build.sh /arrow /build /tmp/dist/java &&
+          /arrow/ci/scripts/java_cdata_integration.sh /arrow /tmp/dist/java" ]
 
   conda-python-turbodbc:
     # Possible $TURBODBC parameters:
@@ -1524,9 +1526,9 @@ services:
     command:
       /bin/bash -c "
         /arrow/ci/scripts/cpp_build.sh /arrow /build &&
-        /arrow/ci/scripts/java_cdata_build.sh /arrow /build/java/c/build /build/java/c &&
-        /arrow/ci/scripts/java_build.sh /arrow /build &&
-        /arrow/ci/scripts/java_test.sh /arrow /build"
+        /arrow/ci/scripts/java_jni_build.sh /arrow /build /tmp/java_dist &&
+        /arrow/ci/scripts/java_build.sh /arrow /build /tmp/java_dist &&
+        /arrow/ci/scripts/java_test.sh /arrow /build /tmp/java_dist"
 
   oracle-java:
     # Usage:
 
@@ -92,9 +92,8 @@ To build only the C Data Interface library:
     $ cd java-native-c
     $ cmake \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_INSTALL_PREFIX=../java-dist \
-        ../java/c
+        -DCMAKE_INSTALL_PREFIX=../java-dist/lib \
+        ../java
     $ cmake --build . --target install
     $ ls -latr ../java-dist/lib
     |__ libarrow_cdata_jni.dylib
 
@@ -1,25 +1,25 @@
-.project
+*.DS_Store
+*.iml
+*.lck
+*.log
+*.patch
+*~
 .buildpath
-.classpath
 .checkstyle
+.classpath
 .factorypath
-.settings/
 .idea/
-TAGS
-*.log
-*.lck
-*.iml
-target/
-*.DS_Store
-*.patch
-*~
-arrow-git.properties
-contrib/native/client/build/
-contrib/native/client/build/*
+.project
+.settings/
+/build/
+/*-build/
 CMakeCache.txt
-CMakeFiles
+CMakeFiles/
 Makefile
+TAGS
+arrow-git.properties
 cmake_install.cmake
 install_manifest.txt
+target/
 ?/
-!c/
+!/c/