commit dcb6742a26bf7383f7bf605e56417a23341c238b
author PJ Fanning <fanningpj@apache.org> Wed Jul 27 09:21:34 2022 +0000
committer PJ Fanning <fanningpj@apache.org> Wed Jul 27 09:21:34 2022 +0000
tree 85da5ea0f4de17be72952535839c805e8e0a9926
parent c3fd22a71ac2a191ce3610934abdbed859073970

try to fix jaav 17 build

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

build.gradle

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

poi-examples/build.gradle

diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 1e72a8f..3947004 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -59,7 +59,7 @@
     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)
     }
 

poi-excelant/build.gradle

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 6dac5d9..3d357ac 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -69,7 +69,7 @@
     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)

poi-ooxml-full/build.gradle

diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 79c7ec1..f37056d 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -60,7 +60,7 @@
     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)

poi/build.gradle

diff --git a/poi/build.gradle b/poi/build.gradle
index 3516de3..42ddb9d 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -94,7 +94,7 @@
     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)