You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/10/28 23:10:54 UTC

svn commit: r1904908 - in /poi/trunk: build.gradle poi-examples/build.gradle poi-excelant/build.gradle poi-ooxml-full/build.gradle poi-ooxml/build.gradle poi/build.gradle

Author: fanningpj
Date: Fri Oct 28 23:10:54 2022
New Revision: 1904908

URL: http://svn.apache.org/viewvc?rev=1904908&view=rev
Log:
jdk19 build issue

Modified:
    poi/trunk/build.gradle
    poi/trunk/poi-examples/build.gradle
    poi/trunk/poi-excelant/build.gradle
    poi/trunk/poi-ooxml-full/build.gradle
    poi/trunk/poi-ooxml/build.gradle
    poi/trunk/poi/build.gradle

Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Oct 28 23:10:54 2022
@@ -213,7 +213,7 @@ subprojects {
         failOnError = true
         maxMemory = "1024M"
         javadocTool = javaToolchains.javadocToolFor {
-            languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+            languageVersion = JavaLanguageVersion.of(jdkVersion)
         }
 
         doFirst {

Modified: poi/trunk/poi-examples/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Fri Oct 28 23:10:54 2022
@@ -59,7 +59,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
 

Modified: poi/trunk/poi-excelant/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Fri Oct 28 23:10:54 2022
@@ -69,7 +69,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)

Modified: poi/trunk/poi-ooxml-full/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Fri Oct 28 23:10:54 2022
@@ -60,7 +60,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)

Modified: poi/trunk/poi-ooxml/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Fri Oct 28 23:10:54 2022
@@ -207,7 +207,7 @@ task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava', ':poi:testJar'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
         if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
     }
     destinationDirectory = file(TEST9_OUT + VERSIONS9)

Modified: poi/trunk/poi/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1904908&r1=1904907&r2=1904908&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Fri Oct 28 23:10:54 2022
@@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
     javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
     }
     destinationDirectory = file(JAVA9_OUT + VERSIONS9)
     source = file(JAVA9_SRC)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org