Adjust job for JDK 11 to not require module java.xml.bind any more

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1838702 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2018-08-23 09:03:49 +00:00
parent 1a3032f253
commit b41625066c
1 changed files with 4 additions and 3 deletions

View File

@ -62,7 +62,7 @@ def poijobs = [
'-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED', '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
'-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED', '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
'-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED', '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
'-Djava9addopens6=--add-opens=java.base/java.lang=java.xml.bind', '-Djava9addopens6=-Dthis.is.a.dummy=true',
'-Djava.locale.providers=JRE,CLDR'], '-Djava.locale.providers=JRE,CLDR'],
skipcigame: true skipcigame: true
], ],
@ -215,8 +215,9 @@ 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' || jdkKey == '1.11') { if(jdkKey == '1.9' || jdkKey == '1.10') {
// when using JDK 9 for running Ant, we need to provide more packages 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 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')
} }
env('FORREST_HOME', poijob.windows ? 'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest') env('FORREST_HOME', poijob.windows ? 'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest')