moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Jenkins DSL: Remove JDK 9 and adjust location of image for the project-logo

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1842275 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2018-09-28 17:43:07 +00:00
parent 9f2892e97e
commit 9e7b1969f9
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jenkins/create_jobs.groovy
View File

@ -25,19 +25,6 @@ def poijobs = [
// the JDK is missing on some slaves so builds are unstable // the JDK is missing on some slaves so builds are unstable
skipcigame: true skipcigame: true
], ],
[ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays,
properties: ['-Djava9addmods=--add-modules=java.xml.bind',
'-Djavadoc9addmods=--add-modules=java.xml.bind',
'-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
'-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
'-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
'-Djava9addopens6=--add-opens=java.base/java.lang=java.xml.bind',
'-Djava.locale.providers=JRE,CLDR'],
skipcigame: true
],
[ name: 'POI-DSL-1.10', jdk: '1.10', trigger: triggerSundays, [ name: 'POI-DSL-1.10', jdk: '1.10', trigger: triggerSundays,
properties: ['-Djava9addmods=--add-modules=java.xml.bind', properties: ['-Djava9addmods=--add-modules=java.xml.bind',
'-Djavadoc9addmods=--add-modules=java.xml.bind', '-Djavadoc9addmods=--add-modules=java.xml.bind',
@ -124,7 +111,6 @@ def defaultSlaves = '(ubuntu||beam)&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubun
def jdkMapping = [ def jdkMapping = [
'1.8': 'JDK 1.8 (latest)', '1.8': 'JDK 1.8 (latest)',
'1.9': 'JDK 1.9 (latest)',
'1.10': 'JDK 10 (latest)', '1.10': 'JDK 10 (latest)',
'1.11': 'JDK 11 (latest)', '1.11': 'JDK 11 (latest)',
'1.12': 'JDK 12 (latest)', '1.12': 'JDK 12 (latest)',
@ -141,7 +127,7 @@ static def shellEx(def context, String cmd, def poijob) {
} }
def defaultDesc = ''' def defaultDesc = '''
<img src="https://poi.apache.org/resources/images/project-logo.jpg" /> <img src="https://poi.apache.org/images/project-header.png" />
<p> <p>
Apache POI - the Java API for Microsoft Documents Apache POI - the Java API for Microsoft Documents
</p> </p>
@ -233,7 +219,7 @@ poijobs.each { poijob ->
label(slaves) label(slaves)
environmentVariables { environmentVariables {
env('LANG', 'en_US.UTF-8') env('LANG', 'en_US.UTF-8')
if(jdkKey == '1.9' || jdkKey == '1.10') { if(jdkKey == '1.10') {
// when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task // when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task
// on JDK 11 and newer there is no such module any more, so do not add it here // 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') 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')
@ -471,8 +457,6 @@ Unfortunately we often see builds break because of changes/new machines...'''
'OpenJDK 8 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed! 'OpenJDK 8 (on Ubuntu only) ', // blank is required here until the name in the Jenkins instance is fixed!
'IBM 1.8 64-bit (on Ubuntu only)', 'IBM 1.8 64-bit (on Ubuntu only)',
'JDK 1.9 (latest)',
'JDK 10 (latest)', 'JDK 10 (latest)',
'JDK 10 b46 (Windows Only)', 'JDK 10 b46 (Windows Only)',
'OpenJDK 10.0.2 (on Ubuntu only)', 'OpenJDK 10.0.2 (on Ubuntu only)',