Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x

Jenkinsfile

@@ -10,9 +10,7 @@ pipeline {
                     options { timeout(time: 120, unit: 'MINUTES') }
                     steps {
                         mavenBuild("jdk11", "-Pmongodb install")
-                        junit '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
                         warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
-                        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: '' +
@@ -89,6 +87,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
@@ -96,4 +95,4 @@ def mavenBuild(jdk, cmdline) {
     }
 }
 
-// vim: et:ts=2:sw=2:ft=groovy
+// vim: et:ts=2:sw=2:ft=groovy

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>