Use gradle toolchain to specify the jdk version and vendor, e.g.

> gradle -no-build-cache -PjdkVersion=16 -PjdkVendor=oracle clean check

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

1 files changed, 22 insertions, 12 deletions

diff --git a/build.gradle b/build.gradle
index f0ceefcc0e..7298484afe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,6 +128,10 @@ subprojects {
         saxonVersion = '11.2'
         apiGuardianVersion = '1.1.2'
 
+        jdkVersion = (project.properties['jdkVersion'] ?: '8') as int
+        // see https://github.com/gradle/gradle/blob/master/subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/JvmVendor.java
+        jdkVendor = (project.properties['jdkVendor'] ?: '') as String
+
         JAVA9_SRC = 'src/main/java9'
         JAVA9_OUT = "${buildDir}/classes/java9/main/"
         TEST9_SRC = 'src/test/java9'
@@ -155,13 +159,10 @@ subprojects {
         options.incremental = true
 
         onlyIf {
-            (name != "compileJava9" && name != "compileTest9") || JavaVersion.current() != JavaVersion.VERSION_1_8
+            (name != "compileJava9" && name != "compileTest9") // || jdkVersion > 8
         }
     }
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
     repositories {
         mavenCentral()
         maven {
@@ -181,6 +182,10 @@ subprojects {
     }
 
     java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+        }
         withJavadocJar()
         withSourcesJar()
     }
@@ -188,11 +193,13 @@ subprojects {
     javadoc {
         failOnError = true
         maxMemory = "1024M"
+        javadocTool = javaToolchains.javadocToolFor {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
+
         doFirst {
             options {
-                if (JavaVersion.current().isJava9Compatible()) {
-                    addBooleanOption('html5', true)
-                }
+                addBooleanOption('html5', true)
                 addBooleanOption('Xdoclint:all,-missing', true)
                 links 'https://poi.apache.org/apidocs/dev/'
                 links 'https://docs.oracle.com/javase/8/docs/api/'
@@ -253,6 +260,11 @@ subprojects {
             junitXml.required = true
         }
 
+        javaLauncher = javaToolchains.launcherFor {
+            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+        }
+
         // Exclude some tests that are not actually tests or do not run cleanly on purpose
         exclude '**/BaseTestBorderStyle.class'
         exclude '**/BaseTestCellUtil.class'
@@ -324,14 +336,12 @@ subprojects {
         systemProperties['java.locale.providers'] = 'JRE,CLDR'
 
         doFirst {
-            if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            if (jdkVersion > 8) {
                 // some options were removed in JDK 18
-                if (JavaVersion.current().ordinal() < JavaVersion.VERSION_18.ordinal()) {
+                if (jdkVersion < 18) {
                     jvmArgs += [
                         '--illegal-access=warn',
                     ]
-                } else {
-                    System.out.println("Configuring for JDK 18 or higher")
                 }
 
                 jvmArgs += [
@@ -403,7 +413,7 @@ subprojects {
         ignoreFailures = false
         suppressAnnotations = [ 'org.apache.poi.util.SuppressForbidden' ]
         // forbiddenapis bundled signatures max supported version is 14
-        targetCompatibility = (JavaVersion.VERSION_14.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_14)
+        // targetCompatibility = (JavaVersion.VERSION_14.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_14)
     }
 
     forbiddenApisMain {