aboutsummaryrefslogtreecommitdiffstats
path: root/poi-scratchpad/build.gradle
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2022-12-27 18:45:15 +0000
committerPJ Fanning <fanningpj@apache.org>2022-12-27 18:45:15 +0000
commit78516f50dc46beee5b6deb1edd678a91eb128f79 (patch)
treed1c799b72679423205d6d856b7718a089c53efa5 /poi-scratchpad/build.gradle
parent98d51e41398b658df158492a9b67a4b5d2ff2983 (diff)
downloadpoi-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-scratchpad/build.gradle')
-rw-r--r--poi-scratchpad/build.gradle34
1 files changed, 2 insertions, 32 deletions
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index fcce89bc2e..9caafbd3f4 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -24,14 +24,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')
}
}
@@ -78,13 +74,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:jar'
@@ -103,22 +92,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')
}
@@ -133,12 +109,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 {