From 78516f50dc46beee5b6deb1edd678a91eb128f79 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
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/build.gradle                     |  34 ++---------------------------
 poi-ooxml/src/main/java9/module-info.class | Bin 3753 -> 0 bytes
 poi-ooxml/src/test/java9/module-info.class | Bin 5140 -> 0 bytes
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 poi-ooxml/src/main/java9/module-info.class
 delete mode 100644 poi-ooxml/src/test/java9/module-info.class

(limited to 'poi-ooxml')

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
deleted file mode 100644
index 505565a8ca..0000000000
Binary files a/poi-ooxml/src/main/java9/module-info.class and /dev/null differ
diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
deleted file mode 100644
index 0585f8f7e5..0000000000
Binary files a/poi-ooxml/src/test/java9/module-info.class and /dev/null differ
-- 
cgit v1.2.3