From 5e212e4a33d2810228423c5546244821e8ad7915 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 26 Dec 2022 10:05:10 +0000 Subject: [PATCH] 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 --- poi-examples/build.gradle | 1 - poi-excelant/build.gradle | 2 -- poi-integration/build.gradle | 1 - poi-ooxml-full/build.gradle | 1 - poi-ooxml-lite-agent/build.gradle | 1 - poi-ooxml-lite/build.gradle | 1 - poi-ooxml/build.gradle | 2 -- poi-scratchpad/build.gradle | 2 -- poi/build.gradle | 2 -- 9 files changed, 13 deletions(-) diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle index 7747a5dde7..855ba38b03 100644 --- a/poi-examples/build.gradle +++ b/poi-examples/build.gradle @@ -60,7 +60,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index bea233d53b..8c67febfd0 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -70,7 +70,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 @@ -95,7 +94,6 @@ task compileTest9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index 4defe90224..94db71b5aa 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -108,7 +108,6 @@ task compileTest9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 28d59caf15..03e6bb335e 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -61,7 +61,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index 45fcb762d8..f6cfff98a3 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -43,7 +43,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index b35ec45c97..7286d4d07e 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -102,7 +102,6 @@ sourcesJar.dependsOn 'compileOoxmlLite' task compileJava9(type: JavaCompile, dependsOn: 'compileJava') { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index be93cc7b06..f1d8bf2363 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -181,7 +181,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 @@ -206,7 +205,6 @@ task compileTest9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle index e7b086d7b2..fcce89bc2e 100644 --- a/poi-scratchpad/build.gradle +++ b/poi-scratchpad/build.gradle @@ -66,7 +66,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 @@ -91,7 +90,6 @@ task compileTest9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 diff --git a/poi/build.gradle b/poi/build.gradle index 158e6e7e62..ab2590b76e 100644 --- a/poi/build.gradle +++ b/poi/build.gradle @@ -95,7 +95,6 @@ task compileJava9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9 @@ -120,7 +119,6 @@ task compileTest9(type: JavaCompile) { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) } sourceCompatibility = 1.9 targetCompatibility = 1.9