doesn't matter what jdk vendor is used to build module-info classes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906212 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-12-26 10:05:10 +00:00
parent 8898d2d15a
commit 5e212e4a33
9 changed files with 0 additions and 13 deletions

View File

@ -60,7 +60,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -70,7 +70,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9
@ -95,7 +94,6 @@ task compileTest9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -108,7 +108,6 @@ task compileTest9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -61,7 +61,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -43,7 +43,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -102,7 +102,6 @@ sourcesJar.dependsOn 'compileOoxmlLite'
task compileJava9(type: JavaCompile, dependsOn: 'compileJava') { task compileJava9(type: JavaCompile, dependsOn: 'compileJava') {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -181,7 +181,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9
@ -206,7 +205,6 @@ task compileTest9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -66,7 +66,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9
@ -91,7 +90,6 @@ task compileTest9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9

View File

@ -95,7 +95,6 @@ task compileJava9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9
@ -120,7 +119,6 @@ task compileTest9(type: JavaCompile) {
javaCompiler = javaToolchains.compilerFor { javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
} }
sourceCompatibility = 1.9 sourceCompatibility = 1.9
targetCompatibility = 1.9 targetCompatibility = 1.9