diff options
| author | PJ Fanning <fanningpj@apache.org> | 2023-05-21 12:01:18 +0000 |
|---|---|---|
| committer | PJ Fanning <fanningpj@apache.org> | 2023-05-21 12:01:18 +0000 |
| commit | 0326a02631742069d56a2a33c40cee28da9f3ea8 (patch) | |
| tree | 1fddd4e505c1ea5db02e6ec396b5f5228129ce9b | |
| parent | 60d5336f7c62eb1a4320ef01b0d9337d95d2db01 (diff) | |
| download | poi-0326a02631742069d56a2a33c40cee28da9f3ea8.tar.gz poi-0326a02631742069d56a2a33c40cee28da9f3ea8.zip | |
use gradle for java 20 build
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1909961 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | jenkins/create_jobs.groovy | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index ec2a522b6d..022fa17ab3 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -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') |