Adjust JDK for old-Xerces, use blanks instead of tabs, reformat the config-section somewhat

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1772275 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-12-01 21:08:22 +00:00
parent 9a3332b146
commit 8eefb40975

View File

@ -9,61 +9,30 @@ H H * * 0
''' '''
def poijobs = [ def poijobs = [
[ [ name: 'POI-DSL-1.6', jdks: ["1.6"]
name: 'POI-DSL-1.6',
jdks: ["1.6"]
], ],
[ [ name: 'POI-DSL-1.8', jdks: ["1.8"], trigger: 'H */12 * * *'
name: 'POI-DSL-1.8',
jdks: ["1.8"],
trigger: 'H */12 * * *'
], ],
[ [ name: 'POI-DSL-OpenJDK', jdks: ["OpenJDK"], trigger: 'H */12 * * *'
name: 'POI-DSL-OpenJDK',
jdks: ["OpenJDK"],
trigger: 'H */12 * * *'
], ],
[ [ name: 'POI-DSL-1.9', jdks: ["1.9"], trigger: triggerSundays,
name: 'POI-DSL-1.9',
jdks: ["1.9"],
trigger: triggerSundays,
properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', '-Djava9addmods=-addmods', '-Djava9addmodsvalue=java.xml.bind', '-Djava.locale.providers=JRE,CLDR'], properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', '-Djava9addmods=-addmods', '-Djava9addmodsvalue=java.xml.bind', '-Djava.locale.providers=JRE,CLDR'],
email: 'centic@apache.org' email: 'centic@apache.org'
], ],
[ [ name: 'POI-DSL-old-Xerces', jdks: ["1.6"], trigger: triggerSundays,
name: 'POI-DSL-old-Xerces',
jdks: ["1.9"],
trigger: triggerSundays,
shell: 'mkdir -p compile-lib && test -f compile-lib/xercesImpl-2.6.1.jar || wget -O compile-lib/xercesImpl-2.6.1.jar http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar\n', shell: 'mkdir -p compile-lib && test -f compile-lib/xercesImpl-2.6.1.jar || wget -O compile-lib/xercesImpl-2.6.1.jar http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar\n',
// the property triggers using Xerces as XML Parser and previously showed some exception that can occur // the property triggers using Xerces as XML Parser and previously showed some exception that can occur
properties: ['-Dadditionaljar=compile-lib/xercesImpl-2.6.1.jar'] properties: ['-Dadditionaljar=compile-lib/xercesImpl-2.6.1.jar']
], ],
[ [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true
name: 'POI-DSL-Maven',
trigger: 'H */4 * * *',
maven: true
], ],
[ [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
name: 'POI-DSL-regenerate-javadoc',
trigger: triggerSundays,
javadoc: true
], ],
[ [ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true
name: 'POI-DSL-API-Check', ],
trigger: '@daily', [ name: 'POI-DSL-Gradle', jdks: ["1.7"], trigger: triggerSundays, email: 'centic@apache.org', gradle: true
apicheck: true ],
], [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true
[
name: 'POI-DSL-Gradle',
jdks: ["1.7"],
trigger: triggerSundays,
email: 'centic@apache.org',
gradle: true
],
[
name: 'POI-DSL-no-scratchpad',
trigger: triggerSundays,
noScratchpad: true
], ],
] ]
@ -136,14 +105,14 @@ Apache POI - the Java API for Microsoft Documents
} }
def shellcmds = '# show which files are currently modified in the working copy\n' + def shellcmds = '# show which files are currently modified in the working copy\n' +
'svn status\n' + 'svn status\n' +
'\n' + '\n' +
'echo $JAVA_HOME\n' + 'echo $JAVA_HOME\n' +
'ls -al $JAVA_HOME\n' + 'ls -al $JAVA_HOME\n' +
'\n' + '\n' +
(poijob.shell ?: '') + '\n' + (poijob.shell ?: '') + '\n' +
'# ignore any error message\n' + '# ignore any error message\n' +
'exit 0\n' 'exit 0\n'
// Create steps and publishers depending on the type of Job that is selected // Create steps and publishers depending on the type of Job that is selected
if(poijob.maven) { if(poijob.maven) {
@ -176,7 +145,7 @@ Apache POI - the Java API for Microsoft Documents
} }
mailer(email, false, false) mailer(email, false, false)
} }
} else if (poijob.javadoc) { } else if (poijob.javadoc) {
steps { steps {
shell(shellcmds) shell(shellcmds)
ant { ant {
@ -187,21 +156,21 @@ Apache POI - the Java API for Microsoft Documents
antInstallation(defaultAnt) antInstallation(defaultAnt)
} }
shell('zip -r build/javadocs.zip build/tmp/site/build/site/apidocs') shell('zip -r build/javadocs.zip build/tmp/site/build/site/apidocs')
} }
publishers { publishers {
configure { project -> configure { project ->
project / publishers << 'hudson.plugins.cigame.GamePublisher' {} project / publishers << 'hudson.plugins.cigame.GamePublisher' {}
} }
mailer(email, false, false) mailer(email, false, false)
} }
} else if (poijob.apicheck) { } else if (poijob.apicheck) {
steps { steps {
shell(shellcmds) shell(shellcmds)
gradle { gradle {
tasks('japicmp') tasks('japicmp')
useWrapper(false) useWrapper(false)
} }
} }
publishers { publishers {
archiveArtifacts('build/*/build/reports/japi.html') archiveArtifacts('build/*/build/reports/japi.html')
configure { project -> configure { project ->
@ -214,36 +183,36 @@ Apache POI - the Java API for Microsoft Documents
shell(shellcmds) shell(shellcmds)
// For Jobs that should still have the default set of publishers we can configure different steps here // For Jobs that should still have the default set of publishers we can configure different steps here
if(poijob.gradle) { if(poijob.gradle) {
gradle { gradle {
tasks('check') tasks('check')
useWrapper(false) useWrapper(false)
} }
} else if (poijob.noScratchpad) { } else if (poijob.noScratchpad) {
ant { ant {
targets(['clean', 'compile-all'] + (poijob.properties ?: [])) targets(['clean', 'compile-all'] + (poijob.properties ?: []))
prop('coverage.enabled', true) prop('coverage.enabled', true)
antInstallation(defaultAnt) antInstallation(defaultAnt)
} }
ant { ant {
targets(['-Dscratchpad.ignore=true', 'jacocotask', 'test-main', 'test-ooxml', 'test-excelant', 'test-ooxml-lite', 'testcoveragereport'] + (poijob.properties ?: [])) targets(['-Dscratchpad.ignore=true', 'jacocotask', 'test-main', 'test-ooxml', 'test-excelant', 'test-ooxml-lite', 'testcoveragereport'] + (poijob.properties ?: []))
antInstallation(defaultAnt) antInstallation(defaultAnt)
} }
} else { } else {
ant { ant {
targets(['clean', 'jenkins'] + (poijob.properties ?: [])) targets(['clean', 'jenkins'] + (poijob.properties ?: []))
prop('coverage.enabled', true) prop('coverage.enabled', true)
// Properties did not work, so I had to use targets instead // Properties did not work, so I had to use targets instead
//properties(poijob.properties ?: '') //properties(poijob.properties ?: '')
antInstallation(defaultAnt) antInstallation(defaultAnt)
} }
ant { ant {
targets(['run'] + (poijob.properties ?: [])) targets(['run'] + (poijob.properties ?: []))
buildFile('src/integrationtest/build.xml') buildFile('src/integrationtest/build.xml')
// Properties did not work, so I had to use targets instead // Properties did not work, so I had to use targets instead
//properties(poijob.properties ?: '') //properties(poijob.properties ?: '')
antInstallation(defaultAnt) antInstallation(defaultAnt)
} }
} }
} }
publishers { publishers {
findbugs('build/findbugs.xml', false) { findbugs('build/findbugs.xml', false) {