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-full | |
| 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-full')
| -rw-r--r-- | poi-ooxml-full/build.gradle | 17 | ||||
| -rw-r--r-- | poi-ooxml-full/src/main/java9/module-info.class | bin | 2611 -> 0 bytes |
2 files changed, 1 insertions, 16 deletions
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 03e6bb335e..ee9edd81d5 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -26,9 +26,7 @@ sourceSets { // TypeSystemHolder.class is in the resources output.dir(BEANS_RES, builtBy: 'generate_beans') compileClasspath += files(BEANS_RES) - if (jdkVersion > 8) { - output.dir(JAVA9_OUT, builtBy: 'cacheJava9') - } + output.dir(JAVA9_OUT, builtBy: 'compileJava9') java { srcDirs = [BEANS_SRC] } @@ -73,13 +71,6 @@ task compileJava9(type: JavaCompile) { ] } -task cacheJava9(type: Copy) { - dependsOn 'compileJava9' - - from(file(JAVA9_OUT + VERSIONS9)) - into(JAVA9_SRC) -} - task copy_xsds(type: Copy) { from ('src/main/xmlschema/org/apache/poi/xdgf') from ('src/main/xmlschema/org/apache/poi/schemas') { @@ -142,12 +133,6 @@ task sourceJar(type: Jar) { jar { dependsOn 'sourceJar' - if (jdkVersion == 8) { - into('META-INF/versions/9') { - from JAVA9_SRC include '*.class' - } - } - manifest { attributes ('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true') } diff --git a/poi-ooxml-full/src/main/java9/module-info.class b/poi-ooxml-full/src/main/java9/module-info.class Binary files differdeleted file mode 100644 index 365080ac1b..0000000000 --- a/poi-ooxml-full/src/main/java9/module-info.class +++ /dev/null |