Skip to content

Commit

Permalink
fix bad merge
Browse files Browse the repository at this point in the history
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
  • Loading branch information
olamy committed Nov 24, 2020
1 parent e2e2809 commit 8ce6ed6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: '' +
Expand Down Expand Up @@ -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']] )
}
}
}
Expand Down

0 comments on commit 8ce6ed6

Please sign in to comment.