mirror of https://github.com/apache/poi.git
jdk19 build issue
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904908 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
07f73d85be
commit
9798625cb9
|
@ -213,7 +213,7 @@ subprojects {
|
||||||
failOnError = true
|
failOnError = true
|
||||||
maxMemory = "1024M"
|
maxMemory = "1024M"
|
||||||
javadocTool = javaToolchains.javadocToolFor {
|
javadocTool = javaToolchains.javadocToolFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
doFirst {
|
doFirst {
|
||||||
|
|
|
@ -59,7 +59,7 @@ task compileJava9(type: JavaCompile) {
|
||||||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
|
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
|
||||||
|
|
||||||
javaCompiler = javaToolchains.compilerFor {
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ task compileJava9(type: JavaCompile) {
|
||||||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
|
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
|
||||||
|
|
||||||
javaCompiler = javaToolchains.compilerFor {
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
||||||
}
|
}
|
||||||
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
||||||
|
|
|
@ -60,7 +60,7 @@ task compileJava9(type: JavaCompile) {
|
||||||
dependsOn 'compileJava'
|
dependsOn 'compileJava'
|
||||||
|
|
||||||
javaCompiler = javaToolchains.compilerFor {
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
||||||
}
|
}
|
||||||
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
||||||
|
|
|
@ -207,7 +207,7 @@ task compileTest9(type: JavaCompile) {
|
||||||
dependsOn 'compileTestJava', ':poi:testJar'
|
dependsOn 'compileTestJava', ':poi:testJar'
|
||||||
|
|
||||||
javaCompiler = javaToolchains.compilerFor {
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
|
||||||
}
|
}
|
||||||
destinationDirectory = file(TEST9_OUT + VERSIONS9)
|
destinationDirectory = file(TEST9_OUT + VERSIONS9)
|
||||||
|
|
|
@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) {
|
||||||
dependsOn 'compileJava'
|
dependsOn 'compileJava'
|
||||||
|
|
||||||
javaCompiler = javaToolchains.compilerFor {
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
|
languageVersion = JavaLanguageVersion.of(jdkVersion)
|
||||||
}
|
}
|
||||||
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
|
||||||
source = file(JAVA9_SRC)
|
source = file(JAVA9_SRC)
|
||||||
|
|
Loading…
Reference in New Issue