Skip to content

ORC-1000: Use Java 17 in GitHub Action #911

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 4 commits into from
Sep 16, 2021
Merged

ORC-1000: Use Java 17 in GitHub Action #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8e5966
ORC-1000: Use Java 17 in GitHub Action
dongjoon-hyun Sep 16, 2021
bf0109e
a
dongjoon-hyun Sep 16, 2021
853651c
Add IDed TODO
dongjoon-hyun Sep 16, 2021
678bdd2
ignore dependency
dongjoon-hyun Sep 16, 2021
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
3 changes: 1 addition & 2 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ jobs:
java:
- 1.8
- 11
- 16
- 17-ea
- 17
env:
MAVEN_OPTS: -Xmx2g
MAVEN_SKIP_RC: true
Expand Down
35 changes: 19 additions & 16 deletions java/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ else()
set(JAVA_PROFILE "-Pcmake,benchmark")
endif()

execute_process(
COMMAND java --add-opens java.base/java.nio=ALL-UNNAMED -version
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE RET
OUTPUT_QUIET
ERROR_QUIET)
if(RET EQUAL 0)
set(JAVA_PROFILE ${JAVA_PROFILE},java17)
set(JAVA_TEST_PROFILE -Pcmake,java17)
set(ADD_OPENS --add-opens)
set(JAVA_NIO java.base/java.nio=ALL-UNNAMED)
endif()
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Sep 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is moved from here and revised.


add_custom_command(
OUTPUT ${ORC_JARS}
COMMAND ./mvnw ${NO_DOWNLOAD_MSG} ${JAVA_PROFILE}
Expand All @@ -50,31 +63,21 @@ add_custom_target(java_build ALL DEPENDS ${ORC_JARS})

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

add_test(
NAME java-examples-test
COMMAND java -jar examples/orc-examples-${ORC_VERSION}-uber.jar write
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
# TOOD(ORC-1003)
# add_test(
# NAME java-examples-test
# COMMAND java -jar examples/orc-examples-${ORC_VERSION}-uber.jar write
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

add_test(
NAME java-tools-test
COMMAND java -jar tools/orc-tools-${ORC_VERSION}-uber.jar version
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

execute_process(
COMMAND java --add-opens java.base/java.nio=ALL-UNNAMED -version
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE RET
OUTPUT_QUIET
ERROR_QUIET)
if(RET EQUAL 0)
set(ADD_OPENS --add-opens)
set(JAVA_NIO java.base/java.nio=ALL-UNNAMED)
endif()

add_test(
NAME java-bench-gen-test
COMMAND java ${ADD_OPENS} ${JAVA_NIO} -jar bench/core/orc-benchmarks-core-${ORC_VERSION}-uber.jar generate data -d sales -s 1
Expand Down
9 changes: 9 additions & 0 deletions java/shims/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredDependencies>
<ignoredDependency>org.apache.hadoop:hadoop-hdfs</ignoredDependency>
</ignoredDependencies>
</configuration>
</plugin>
</plugins>
</build>

Expand Down