git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1908529 13f79535-47bb-0310-9956-ffa450edef68tags/REL_5_2_4
@@ -51,7 +51,6 @@ final List MODULE_COMPILE_PATH = sourceSets.main.compileClasspath.findAll{ it.pa | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -59,7 +59,6 @@ final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlfor | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -77,7 +76,6 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -140,7 +138,6 @@ artifacts { | |||
test { | |||
dependsOn { testJar } | |||
onlyIf { jdkVersion > 8 } // unfortunately, Java 8 builds on https://ci-builds.apache.org/ are hanging | |||
doFirst { | |||
jvmArgs += [ |
@@ -92,7 +92,6 @@ final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlfor | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -56,7 +56,6 @@ compileJava { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -38,7 +38,6 @@ java { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -90,7 +90,6 @@ processResources.dependsOn 'compileOoxmlLite' | |||
sourcesJar.dependsOn 'compileOoxmlLite' | |||
task compileJava9(type: JavaCompile, dependsOn: 'compileJava') { | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
} |
@@ -152,7 +152,6 @@ compileJava { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -170,7 +169,6 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi:testJar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -266,8 +264,6 @@ artifacts { | |||
} | |||
test { | |||
onlyIf { jdkVersion > 8 } // unfortunately, Java 8 builds on https://ci-builds.apache.org/ are hanging | |||
// for some reason catching the OOM does not work when run from Gradle | |||
exclude '**/MemoryUsage.class' | |||
@@ -55,7 +55,6 @@ final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -73,7 +72,6 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -97,7 +97,6 @@ task compileJava9(type: JavaCompile) { | |||
'--module-path', sourceSets.main.compileClasspath.asPath | |||
] | |||
} | |||
compileJava9.onlyIf {jdkVersion > 8} | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava' | |||
@@ -115,7 +114,6 @@ task compileTest9(type: JavaCompile) { | |||
] | |||
classpath = files() | |||
} | |||
compileTest9.onlyIf {jdkVersion > 8} | |||
jar { | |||
dependsOn compileJava9 |