diff options
| author | PJ Fanning <fanningpj@apache.org> | 2022-01-22 21:34:35 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2022-01-22 21:34:35 +0000 |
| commit | e71e6027620f832bac07607d4f066c4f76f348ac (patch) | |
| tree | 1209dab676d2234c471a1a3e242adf49d5f4de58 /poi-scratchpad | |
| parent | 1ee199b1ea8ce524d734aa5e9fa7fbe0c4a52ac0 (diff) | |
| download | poi-e71e6027620f832bac07607d4f066c4f76f348ac.tar.gz poi-e71e6027620f832bac07607d4f066c4f76f348ac.zip | |
revert test module changes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897355 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi-scratchpad')
| -rw-r--r-- | poi-scratchpad/build.gradle | 7 |
1 files changed, 2 insertions, 5 deletions
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 { |