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

Jenkinsfile

@@ -50,7 +50,20 @@ node {
         // Run test phase / ignore test failures
         sh "mvn -B install -Dmaven.test.failure.ignore=true"
         // Report failures in the jenkins UI
-        step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml'])
+        step([$class: 'JUnitResultArchiver', 
+            testResults: '**/target/surefire-reports/TEST-*.xml'])
+        // Collect up the jacoco execution results
+        step([$class: 'JacocoPublisher', 
+            execPattern: '**/target/jacoco.exec', 
+            classPattern: '**/target/classes', 
+            sourcePattern: '**/src/main/java'])
+        // Report on Maven and Javadoc warnings
+        step([$class: 'WarningsPublisher', 
+            consoleParsers: [
+                [parserName: 'Maven'],
+                [parserName: 'JavaDoc'],
+                [parserName: 'JavaC']
+            ]])
       }
       if(isUnstable())
       {

pom.xml

@@ -147,6 +147,27 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.7.7.201606060606</version>
+        <executions>
+          <execution>
+            <id>jacoco-initialize</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>jacoco-site</id>
+            <phase>package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
         <executions>
@@ -521,9 +542,9 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.19.1</version>
           <configuration>
-            <argLine>-showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
+            <argLine>@{argLine} -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
             <failIfNoTests>false</failIfNoTests>
-	    <runOrder>random</runOrder>
+            <forkCount>1</forkCount>
             <systemProperties>
               <property>
                 <name>java.io.tmpdir</name>