From 78516f50dc46beee5b6deb1edd678a91eb128f79 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 27 Dec 2022 18:45:15 +0000 Subject: 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 --- poi-ooxml-lite/build.gradle | 15 +-------------- poi-ooxml-lite/src/main/java9/module-info.class | Bin 1867 -> 0 bytes 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 poi-ooxml-lite/src/main/java9/module-info.class (limited to 'poi-ooxml-lite') diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 7286d4d07e..28879d6fa5 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -22,9 +22,7 @@ final String BEANS_RES = "${buildDir}/generated-resources" sourceSets { main { - if (jdkVersion > 8) { - output.dir(JAVA9_OUT, builtBy: 'cacheJava9') - } + output.dir(JAVA9_OUT, builtBy: 'compileJava9') compileClasspath += files(BEANS_RES) java { srcDirs += BEANS_SRC @@ -116,11 +114,6 @@ task compileJava9(type: JavaCompile, dependsOn: 'compileJava') { } } -task cacheJava9(type: Copy, dependsOn: 'compileJava9') { - from(file(JAVA9_OUT + VERSIONS9)) - into(JAVA9_SRC) -} - jar { destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") @@ -138,12 +131,6 @@ jar { } } - if (jdkVersion == 8) { - into('META-INF/versions/9') { - from JAVA9_SRC include '*.class' - } - } - // ignore second module-info.class from poi-ooxml-full // duplicatesStrategy = 'exclude' includeEmptyDirs = false diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class deleted file mode 100644 index 61cdb0a1b8..0000000000 Binary files a/poi-ooxml-lite/src/main/java9/module-info.class and /dev/null differ -- cgit v1.2.3