aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2022-10-28 23:10:54 +0000
committerPJ Fanning <fanningpj@apache.org>2022-10-28 23:10:54 +0000
commit9798625cb97bfab4cb58396544dce8438e74d345 (patch)
tree8bdcd00e502f4cf9574e00f2f2d500edfa586f48
parent07f73d85be53a5b6148b3e001bf7368642b12a35 (diff)
downloadpoi-9798625cb97bfab4cb58396544dce8438e74d345.tar.gz
poi-9798625cb97bfab4cb58396544dce8438e74d345.zip
jdk19 build issue
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904908 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.gradle2
-rw-r--r--poi-examples/build.gradle2
-rw-r--r--poi-excelant/build.gradle2
-rw-r--r--poi-ooxml-full/build.gradle2
-rw-r--r--poi-ooxml/build.gradle2
-rw-r--r--poi/build.gradle2
6 files changed, 6 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 871a458bce..14c9d18814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -213,7 +213,7 @@ subprojects {
failOnError = true
maxMemory = "1024M"
javadocTool = javaToolchains.javadocToolFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
}
doFirst {
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 3947004c16..1e72a8f778 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -59,7 +59,7 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index b7a9409020..4afc271d4f 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -69,7 +69,7 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index f37056df85..79c7ec1a4b 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -60,7 +60,7 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 2571146f90..ed9c007d23 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -207,7 +207,7 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi:testJar'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
destinationDirectory = file(TEST9_OUT + VERSIONS9)
diff --git a/poi/build.gradle b/poi/build.gradle
index 42ddb9d1fa..ec0aa868e9 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
}
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
source = file(JAVA9_SRC)