diff options
| -rw-r--r-- | poi-excelant/build.gradle | 4 | ||||
| -rw-r--r-- | poi-integration/build.gradle | 4 | ||||
| -rw-r--r-- | poi-ooxml/build.gradle | 5 | ||||
| -rw-r--r-- | poi-scratchpad/build.gradle | 7 | ||||
| -rw-r--r-- | poi/build.gradle | 2 |
5 files changed, 6 insertions, 16 deletions
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index 8e6b437ed1..a4dcedce2b 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -154,7 +154,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) { } } - from sourceSets.test.output + from sourceSets.test.output + sourceSets.main.output manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') @@ -172,14 +172,12 @@ test { jvmArgs += [ "-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-excelant-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath, ] } - */ } } diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index cd3ff04c67..ec859eac36 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -147,7 +147,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) { } } - from sourceSets.test.output + from sourceSets.test.output + sourceSets.main.output manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') @@ -170,14 +170,12 @@ test { jvmArgs += [ "-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-integration-tests' + File.pathSeparator + files(MODULE_RUNTIME_PATH).asPath, ] } - */ if (NO_SCRATCHPAD) { systemProperty 'scratchpad.ignore', 'true' } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index b15b104ea8..9674b6ff9a 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -204,7 +204,6 @@ 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 ] @@ -248,7 +247,7 @@ task testJar(type: Jar, dependsOn: testClasses) { } } - from sourceSets.test.output + from sourceSets.test.output + sourceSets.main.output manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') @@ -321,14 +320,12 @@ 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, ] } - */ } } diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle index 917ae37673..8c2549643b 100644 --- a/poi-scratchpad/build.gradle +++ b/poi-scratchpad/build.gradle @@ -90,7 +90,6 @@ 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 ] @@ -134,7 +133,7 @@ task testJar(type: Jar, dependsOn: testClasses) { } } - from sourceSets.test.output + from sourceSets.test.output + sourceSets.main.output manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') @@ -176,16 +175,14 @@ test { systemProperties['junit.jupiter.execution.parallel.enabled'] = 'true' - /* doFirst { if (JavaVersion.current() != JavaVersion.VERSION_1_8) { jvmArgs += [ '--add-modules', MODULE_NAME, - '--module-path', '${projectDir}/../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath, + '--module-path', '../build/dist/maven/poi-scratchpad-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath, ] } } - */ } publishing { diff --git a/poi/build.gradle b/poi/build.gradle index b1bc4e4059..b2aa41d8bb 100644 --- a/poi/build.gradle +++ b/poi/build.gradle @@ -162,7 +162,7 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ]) { } } - from sourceSets.test.output + from sourceSets.test.output + sourceSets.main.output manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') |