diff options
Diffstat (limited to 'poi-ooxml/build.gradle')
-rw-r--r-- | poi-ooxml/build.gradle | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index eb585bec80..1c2ffca5c9 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -35,14 +35,10 @@ configurations { sourceSets { main { - if (jdkVersion > 8) { - output.dir(JAVA9_OUT, builtBy: 'cacheJava9') - } + output.dir(JAVA9_OUT, builtBy: 'compileJava9') } test { - if (jdkVersion > 8) { - output.dir(TEST9_OUT, builtBy: 'cacheTest9') - } + output.dir(TEST9_OUT, builtBy: 'compileTest9') } } @@ -175,13 +171,6 @@ task compileJava9(type: JavaCompile) { ] } -task cacheJava9(type: Copy) { - dependsOn 'compileJava9' - - from(file(JAVA9_OUT + VERSIONS9)) - into(JAVA9_SRC) -} - task compileTest9(type: JavaCompile) { dependsOn 'compileTestJava', ':poi:testJar' @@ -200,22 +189,9 @@ 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}") - if (jdkVersion == 8) { - into('META-INF/versions/9') { - from JAVA9_SRC include '*.class' - } - } - manifest { attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') } @@ -230,12 +206,6 @@ task testJar(type: Jar, dependsOn: testClasses) { // 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 { |