diff options
author | PJ Fanning <fanningpj@apache.org> | 2022-12-27 18:45:15 +0000 |
---|---|---|
committer | PJ Fanning <fanningpj@apache.org> | 2022-12-27 18:45:15 +0000 |
commit | 78516f50dc46beee5b6deb1edd678a91eb128f79 (patch) | |
tree | d1c799b72679423205d6d856b7718a089c53efa5 /poi-ooxml | |
parent | 98d51e41398b658df158492a9b67a4b5d2ff2983 (diff) | |
download | poi-78516f50dc46beee5b6deb1edd678a91eb128f79.tar.gz poi-78516f50dc46beee5b6deb1edd678a91eb128f79.zip |
try to get rid of cached module-info classes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906232 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi-ooxml')
-rw-r--r-- | poi-ooxml/build.gradle | 34 | ||||
-rw-r--r-- | poi-ooxml/src/main/java9/module-info.class | bin | 3753 -> 0 bytes | |||
-rw-r--r-- | poi-ooxml/src/test/java9/module-info.class | bin | 5140 -> 0 bytes |
3 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 { diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class Binary files differdeleted file mode 100644 index 505565a8ca..0000000000 --- a/poi-ooxml/src/main/java9/module-info.class +++ /dev/null diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class Binary files differdeleted file mode 100644 index 0585f8f7e5..0000000000 --- a/poi-ooxml/src/test/java9/module-info.class +++ /dev/null |