Author: fanningpj
Date: Sun May 21 12:01:18 2023
New Revision: 1909961

URL: http://svn.apache.org/viewvc?rev=1909961&view=rev
Log:
use gradle for java 20 build

Modified:
    poi/trunk/jenkins/create_jobs.groovy

Modified: poi/trunk/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1909961&r1=1909960&r2=1909961&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sun May 21 12:01:18 2023
@@ -41,9 +41,7 @@ def poijobs = [
         [ name: 'POI-DSL-1.19', jdk: '1.19', trigger: triggerSundays, 
skipcigame: true, skipSpotbugs: true
         ],
         // Jenkins on ci-builds.apache.org does not support spotbugs with a 
new enough version of asm for Java18+
-        [ name: 'POI-DSL-1.20', jdk: '1.20', trigger: triggerSundays, 
skipcigame: true, skipSpotbugs: true,
-          // these two can be removed again when gradle supports JDK 20
-          useAnt: true, skipSourceBuild: true
+        [ name: 'POI-DSL-1.20', jdk: '1.20', trigger: triggerSundays, 
skipcigame: true, skipSpotbugs: true
         ],
         // Use Ant-build for now as selecting IBM JDK via toolchain does not 
work (yet)
         [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays, 
skipcigame: true, useAnt: true
@@ -495,7 +493,7 @@ xmlbeansjobs.each { xjob ->
                 // on JDK 11 and newer there is no such module any more, so do 
not add it here
                 env('ANT_OPTS', '--add-modules=java.xml.bind 
--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED 
--add-opens=java.base/java.lang=ALL-UNNAMED')
             } else if (jdkKey == '1.11' || jdkKey == '1.12' || jdkKey == 
'1.13' || jdkKey == '1.14' || jdkKey == '1.15' || jdkKey == '1.16' || jdkKey == 
'1.17'
-                    || jdkKey == '1.18' || jdkKey == '1.19' || jdkKey == 
'1.20') {
+                    || jdkKey == '1.18' || jdkKey == '1.19' || jdkKey == 
'1.20' || jdkKey == '1.21') {
                 env('ANT_OPTS', 
'--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED 
--add-opens=java.base/java.lang=ALL-UNNAMED')
             }
             // will be needed for forbidden-apis-check: env('ANT_HOME', 
xjob.windows ? 'f:\\jenkins\\tools\\ant\\latest' : '/usr/share/ant')



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to