diff options
Diffstat (limited to 'poi-integration')
| -rw-r--r-- | poi-integration/build.gradle | 19 | ||||
| -rw-r--r-- | poi-integration/src/test/java9/module-info.class | bin | 685 -> 0 bytes |
2 files changed, 2 insertions, 17 deletions
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index 94db71b5aa..9b46ca3940 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -29,9 +29,7 @@ configurations { sourceSets { test { - if (jdkVersion > 8) { - output.dir(TEST9_OUT, builtBy: 'cacheTest9') - } + output.dir(TEST9_OUT, builtBy: 'compileTest9') if (IBMVM) { java { exclude '**/HeapDump**' @@ -121,13 +119,6 @@ task compileTest9(type: JavaCompile) { } -task cacheTest9(type: Copy) { - dependsOn 'compileTest9' - - from(file(TEST9_OUT + VERSIONS9)) - into(TEST9_SRC) -} - jar { destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") @@ -138,19 +129,13 @@ jar { // Create a separate jar for test-code to depend on it in other projects // See http://stackoverflow.com/questions/5144325/gradle-test-dependency -task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) { +task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) { destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests") classifier 'tests' // ignore second module-info.class from main duplicatesStrategy = 'exclude' - if (jdkVersion == 8) { - into('META-INF/versions/9') { - from TEST9_SRC include '*.class' - } - } - from sourceSets.test.output + sourceSets.main.output manifest { diff --git a/poi-integration/src/test/java9/module-info.class b/poi-integration/src/test/java9/module-info.class Binary files differdeleted file mode 100644 index 1efde42739..0000000000 --- a/poi-integration/src/test/java9/module-info.class +++ /dev/null |