Merge branch 'jetty-9.3.x' into jetty-9.4.x

Jenkinsfile

@@ -14,21 +14,16 @@ node {
   stage 'Compile'
 
   withEnv(mvnEnv) {
-    sh "mvn clean install -DskipTests"
+    sh "mvn -B clean install -Dtest=None"
   }
 
   stage 'Javadoc'
 
   withEnv(mvnEnv) {
-    sh "mvn javadoc:jar"
-  }
-
-  stage 'Test'
-
-  withEnv(mvnEnv) {
-    sh "mvn test -Dmaven.test.failure.ignore=true"
+    sh "mvn -B javadoc:javadoc"
   }
 
+  /*
   stage 'Documentation'
 
   dir("jetty-documentation") {
@@ -36,12 +31,30 @@ node {
       sh "mvn clean install"
     }
   }
+  */
+
+  stage 'Test'
+
+  withEnv(mvnEnv) {
+    // Run package then test phase / skip main compilation / ignore failures
+    sh "mvn -B package test -Dmaven.main.skip=true -Dmaven.test.failure.ignore=true"
+    // Report failures in the jenkins UI
+    step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml'])
+  }
 
   stage 'Compact3'
 
   dir("aggregates/jetty-all-compact3") {
     withEnv(mvnEnv) {
-      sh "${mvnHome}/bin/mvn -Pcompact3 clean install"
+      sh "mvn -B -Pcompact3 clean install"
     }
   }
+
+  /*
+  stage 'Deploy SNAPSHOT'
+
+  withEnv(mvnEnv) {
+    sh "mvn -B -Peclipse-release clean compile javadoc:jar source:jar gpg:sign deploy"
+  }
+   */
 }

pom.xml

@@ -616,11 +616,6 @@
             <onlyAnalyze>org.eclipse.jetty.*</onlyAnalyze>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.jetty.toolchain</groupId>
-          <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>2.0</version>
-        </plugin>
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>