From 8ce6ed623ef3b4058f8ef97fb2a65dd86f8fe65f Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Tue, 24 Nov 2020 10:02:35 +1000 Subject: [PATCH] fix bad merge Signed-off-by: olivier lamy --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a3cc844aa8f..972dd227e91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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']] ) } } }