Jenkins DSL: Do not try to rebuild sources with Gradle for JDK 20

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906274 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2022-12-30 08:11:30 +00:00
parent 42a2c9606a
commit f3fbf0233a
1 changed files with 11 additions and 7 deletions

View File

@ -56,7 +56,9 @@ def poijobs = [
[ name: 'POI-DSL-1.19', jdk: '1.19', trigger: triggerSundays, skipcigame: true, skipSpotbugs: true [ 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+ // 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, useAnt: true [ 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
], ],
// Use Ant-build for now as selecting IBM JDK via toolchain does not work (yet) // 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 [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays, skipcigame: true, useAnt: true
@ -466,12 +468,14 @@ poijobs.each { poijob ->
//properties(poijob.properties ?: '') //properties(poijob.properties ?: '')
antInstallation(antRT) antInstallation(antRT)
} }
ant { if(!poijob.skipSourceBuild) {
targets(['run'] + (poijob.properties ?: [])) ant {
buildFile('poi-integration/build.xml') targets(['run'] + (poijob.properties ?: []))
// Properties did not work, so I had to use targets instead buildFile('poi-integration/build.xml')
//properties(poijob.properties ?: '') // Properties did not work, so I had to use targets instead
antInstallation(antRT) //properties(poijob.properties ?: '')
antInstallation(antRT)
}
} }
} }
} }