fix bad merge

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2020-11-24 10:02:35 +10:00
parent e2e2809ba8
commit 8ce6ed623e
1 changed files with 2 additions and 1 deletions

3
Jenkinsfile vendored
View File

@ -13,7 +13,7 @@ pipeline {
container('jetty-build') {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk11", "-T3 clean install", "maven3",
[[parserName: 'Maven'], [parserName: 'Java']] ) // -Pautobahn
[[parserName: 'Maven'], [parserName: 'Java']] )
// Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
exclusionPattern: '' +
@ -42,6 +42,7 @@ pipeline {
container( 'jetty-build' ) {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk15", "clean install -T3 -Djacoco.skip=true -Djacoco.skip=true", "maven3",
[[parserName: 'Maven'], [parserName: 'Java']] )
}
}
}