aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2023-03-19 13:17:53 +0000
committerPJ Fanning <fanningpj@apache.org>2023-03-19 13:17:53 +0000
commit17899fc75b27cfb8ca001dd580ba9549b03646e4 (patch)
tree8b3ec8df2a96d9fd0e89d4fb74597e691f247ec2
parent9f0fe6139e9e3a490a7471961f259ffeb1341b2d (diff)
downloadpoi-17899fc75b27cfb8ca001dd580ba9549b03646e4.tar.gz
poi-17899fc75b27cfb8ca001dd580ba9549b03646e4.zip
temporary hack to build to see if the gradle toolchain logic is what is breaking all our https://ci-builds.apache.org/ builds for Java 8
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1908515 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--poi-examples/build.gradle1
-rw-r--r--poi-excelant/build.gradle2
-rw-r--r--poi-integration/build.gradle1
-rw-r--r--poi-ooxml-full/build.gradle1
-rw-r--r--poi-ooxml-lite-agent/build.gradle1
-rw-r--r--poi-ooxml-lite/build.gradle1
-rw-r--r--poi-ooxml/build.gradle2
-rw-r--r--poi-scratchpad/build.gradle2
-rw-r--r--poi/build.gradle2
9 files changed, 13 insertions, 0 deletions
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index ed6ae97c92..43d79bf494 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -51,6 +51,7 @@ 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))
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index d61d41267b..4a07920cd7 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -59,6 +59,7 @@ 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))
@@ -76,6 +77,7 @@ 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))
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 49cbc94b45..cf81d90f47 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -92,6 +92,7 @@ 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))
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 430153689d..46d69591ea 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -56,6 +56,7 @@ compileJava {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
+ onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
index 00f9b4f514..3d4ff54c94 100644
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -38,6 +38,7 @@ java {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
+ onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index e9e046f2c5..2073737342 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -90,6 +90,7 @@ 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))
}
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index bb54b14bbb..73c5145cb9 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -152,6 +152,7 @@ compileJava {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi:jar'
+ onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -169,6 +170,7 @@ 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))
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index 7f08037587..027aa88051 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -55,6 +55,7 @@ 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))
@@ -72,6 +73,7 @@ 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))
diff --git a/poi/build.gradle b/poi/build.gradle
index bf54b17b0a..211ac58ddd 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -97,6 +97,7 @@ task compileJava9(type: JavaCompile) {
'--module-path', sourceSets.main.compileClasspath.asPath
]
}
+compileJava9.onlyIf {jdkVersion > 8}
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava'
@@ -114,6 +115,7 @@ task compileTest9(type: JavaCompile) {
]
classpath = files()
}
+compileTest9.onlyIf {jdkVersion > 8}
jar {
dependsOn compileJava9