mirror of https://github.com/apache/poi.git
try to fix jaav 17 build
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903051 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c3fd22a71a
commit
dcb6742a26
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue