From 9ee57192dc23c1b7c3b1e80fd786fa6cf822e856 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 28 Nov 2018 10:12:07 +1000
Subject: [PATCH 1/2] use withMaven junit publisher (#3150)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1792f665999..cc9bec25fd4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,6 @@ pipeline {
           options { timeout(time: 120, unit: 'MINUTES') }
           steps {
             mavenBuild("jdk8", "-Pmongodb install")
-            junit '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
             // Collect up the jacoco execution results (only on main build)
             jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                 exclusionPattern: '' +
@@ -95,6 +94,7 @@ def mavenBuild(jdk, cmdline) {
       jdk: "$jdk",
       publisherStrategy: 'EXPLICIT',
       globalMavenSettingsConfig: settingsName,
+      options: [junitPublisher(disabled: false)],
       mavenOpts: mavenOpts,
       mavenLocalRepo: localRepo) {
     // Some common Maven command line + provided command line
@@ -102,4 +102,4 @@ def mavenBuild(jdk, cmdline) {
   }
 }
 
-// vim: et:ts=2:sw=2:ft=groovy
\ No newline at end of file
+// vim: et:ts=2:sw=2:ft=groovy

From bee1487eccc135d98bcf88b56d9af2bed4dff7fc Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 28 Nov 2018 10:13:04 +1000
Subject: [PATCH 2/2] copying base resources must happen when preparing
 packaging we must not rely on id (#3138)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-distribution/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 05976455701..e83ad110f1f 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -29,7 +29,7 @@
         <executions>
           <execution>
             <id>copy-base-assembly-tree</id>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>