[arrow] branch master updated: ARROW-16941: [Java][Dataset] Update more jni_util.h paths (#13503)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new e44f79af8e ARROW-16941: [Java][Dataset] Update more jni_util.h paths 
(#13503)
e44f79af8e is described below

commit e44f79af8e2eef837ec59b7941e4eaa813a2dd44
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Tue Jul 5 15:23:20 2022 +0900

    ARROW-16941: [Java][Dataset] Update more jni_util.h paths (#13503)
    
    This is a follow-up of #13481.
    
    We also need to update jni_util.h path in
    java/dataset/src/main/cpp/jni_util_test.cc.
    
    Removing "./" is needless but it's redundant.
    
    Authored-by: Sutou Kouhei <k...@clear-code.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 ci/docker/linux-apt-jni.dockerfile          | 2 +-
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +-
 java/dataset/src/main/cpp/jni_util.cc       | 2 +-
 java/dataset/src/main/cpp/jni_util_test.cc  | 2 +-
 java/dataset/src/main/cpp/jni_wrapper.cc    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/docker/linux-apt-jni.dockerfile 
b/ci/docker/linux-apt-jni.dockerfile
index 6673b001d7..be6562eae6 100644
--- a/ci/docker/linux-apt-jni.dockerfile
+++ b/ci/docker/linux-apt-jni.dockerfile
@@ -69,7 +69,7 @@ ARG cmake=3.11.4
 RUN wget -nv -O - 
https://github.com/Kitware/CMake/releases/download/v${cmake}/cmake-${cmake}-Linux-x86_64.tar.gz
 | tar -xzf - -C /opt
 ENV PATH=/opt/cmake-${cmake}-Linux-x86_64/bin:$PATH
 
-ENV ARROW_BUILD_TESTS=OFF \
+ENV ARROW_BUILD_TESTS=ON \
     ARROW_DATASET=ON \
     ARROW_FLIGHT=OFF \
     ARROW_GANDIVA_JAVA=ON \
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 245a458ef0..8dea78eec9 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -914,7 +914,7 @@ macro(build_boost)
   set(BOOST_VENDORED TRUE)
 endmacro()
 
-if(ARROW_FLIGHT AND ARROW_BUILD_TESTS)
+if(ARROW_BUILD_TESTS)
   set(ARROW_BOOST_REQUIRED_VERSION "1.64")
 else()
   set(ARROW_BOOST_REQUIRED_VERSION "1.58")
diff --git a/java/dataset/src/main/cpp/jni_util.cc 
b/java/dataset/src/main/cpp/jni_util.cc
index e54dcba32b..76c62d8d37 100644
--- a/java/dataset/src/main/cpp/jni_util.cc
+++ b/java/dataset/src/main/cpp/jni_util.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "./jni_util.h"
+#include "jni_util.h"
 
 #include <memory>
 #include <mutex>
diff --git a/java/dataset/src/main/cpp/jni_util_test.cc 
b/java/dataset/src/main/cpp/jni_util_test.cc
index eec1ad245a..a15a932252 100644
--- a/java/dataset/src/main/cpp/jni_util_test.cc
+++ b/java/dataset/src/main/cpp/jni_util_test.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "jni/dataset/jni_util.h"
+#include "jni_util.h"
 
 #include <gtest/gtest.h>
 
diff --git a/java/dataset/src/main/cpp/jni_wrapper.cc 
b/java/dataset/src/main/cpp/jni_wrapper.cc
index 9312825e28..ef2f16894b 100644
--- a/java/dataset/src/main/cpp/jni_wrapper.cc
+++ b/java/dataset/src/main/cpp/jni_wrapper.cc
@@ -24,7 +24,7 @@
 #include "arrow/filesystem/localfs.h"
 #include "arrow/ipc/api.h"
 #include "arrow/util/iterator.h"
-#include "./jni_util.h"
+#include "jni_util.h"
 #include "org_apache_arrow_dataset_file_JniWrapper.h"
 #include "org_apache_arrow_dataset_jni_JniWrapper.h"
 #include "org_apache_arrow_dataset_jni_NativeMemoryPool.h"