Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix build for Java 9+ 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897343 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-01-22 14:28:17 +00:00
parent e0b84ef6ef
commit ca9cf3c6f8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
poi-ooxml/build.gradle
View File

@ -204,6 +204,7 @@ task compileTest9(type: JavaCompile) {
destinationDirectory = file(TEST9_OUT + VERSIONS9)
source = file(TEST9_SRC)
options.compilerArgs = [
'--patch-module', "org.apache.poi.poi=${projectDir}/../poi/build/classes/java/main",
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
@ -320,12 +321,14 @@ test {
"-XX:ErrorFile=../build/hs_err_pid%p.log",
"-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}"
]
/*
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '../build/dist/maven/poi-ooxml-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
]
}
*/
}
}

5
poi-scratchpad/build.gradle
View File

@ -90,6 +90,7 @@ task compileTest9(type: JavaCompile) {
destinationDirectory = file(TEST9_OUT + VERSIONS9)
source = file(TEST9_SRC)
options.compilerArgs = [
'--patch-module', "org.apache.poi.poi=${projectDir}/../poi/build/classes/java/main",
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
@ -175,14 +176,16 @@ test {
systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true'
/*
doFirst {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
jvmArgs += [
'--add-modules', MODULE_NAME,
'--module-path', '../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
'--module-path', '${projectDir}/../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
]
}
}
*/
}
publishing {