Skip to content

ORC-739: Use Maven Wrapper in java/CMakeLists.txt #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongjoon-hyun merged 1 commit into from
Jan 24, 2021
Merged

ORC-739: Use Maven Wrapper in java/CMakeLists.txt #632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions java/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(NO_DOWNLOAD_MSG
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn)

# set the version in the POM file to match the CMake version string
execute_process(COMMAND mvn versions:set -DnewVersion=${ORC_VERSION}
execute_process(COMMAND ./mvnw versions:set -DnewVersion=${ORC_VERSION}
-DgenerateBackupPoms=false
-Pbenchmark
${NO_DOWNLOAD_MSG}
Expand All @@ -36,7 +36,7 @@ endif()

add_custom_command(
OUTPUT ${ORC_JARS}
COMMAND mvn ${NO_DOWNLOAD_MSG} ${JAVA_PROFILE}
COMMAND ./mvnw ${NO_DOWNLOAD_MSG} ${JAVA_PROFILE}
-Dbuild.dir=${CMAKE_CURRENT_BINARY_DIR} -DskipTests package
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Build the java directory"
Expand All @@ -46,7 +46,7 @@ add_custom_target(java_build ALL DEPENDS ${ORC_JARS})

add_test(
NAME java-test
COMMAND mvn ${NO_DOWNLOAD_MSG} -Pcmake
COMMAND ./mvnw ${NO_DOWNLOAD_MSG} -Pcmake
-Dbuild.dir=${CMAKE_CURRENT_BINARY_DIR} test
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

Expand Down