try to fix jaav 17 build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903051 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.gradle b/build.gradle
index ac1f869fa9a7fbe6de1a200d1798a770b8b5d2bf..0318f1cba4f121cb927372bb5a323c476d1bed38 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -212,7 +212,7 @@ subprojects {
         failOnError = true
         maxMemory = "1024M"
         javadocTool = javaToolchains.javadocToolFor {
-            languageVersion = JavaLanguageVersion.of(Math.max(11,jdkVersion))
+            languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
         }
 
         doFirst {

diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 1e72a8f77841a71c6f2034eca9e797571b8797a0..3947004c16980c87fd010b152dbc8105daf9ba18 100644 (file)
--- 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)
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 6dac5d9fcb281249f74034e6a36ecd3d67260802..3d357acc83c341ed7d0aa0f394d1ca4e5b5e9f08 100644 (file)
--- 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)
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
         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 79c7ec1a4b48319fe696b7da75555f260bf68068..f37056df85f5f0a579ffe451fb632ce7d3aae83f 100644 (file)
--- 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)
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)

diff --git a/poi/build.gradle b/poi/build.gradle
index 3516de3966e1809b9c241694b211ce8027a0c9d3..42ddb9d1fa32db2be0761b2bb977f0709f2fe234 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)
     source = file(JAVA9_SRC)