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

Jenkinsfile

@@ -20,7 +20,7 @@ node {
   {
     stage 'Compile'
     withEnv(mvnEnv) {
-      timeout(15) {
+      timeout(time: 15, unit: 'MINUTES') {
         sh "mvn -B clean install -Dtest=None"
       }
     }
@@ -33,7 +33,7 @@ node {
   {
     stage 'Javadoc'
     withEnv(mvnEnv) {
-      timeout(15) {
+      timeout(time: 15, unit: 'MINUTES') {
         sh "mvn -B javadoc:javadoc"
       }
     }
@@ -46,7 +46,7 @@ node {
   {
     stage 'Test'
     withEnv(mvnEnv) {
-      timeout(60) {
+      timeout(time: 60, unit: 'MINUTES') {
         // Run test phase / ignore test failures
         sh "mvn -B install -Dmaven.test.failure.ignore=true"
         // Report failures in the jenkins UI
@@ -54,6 +54,7 @@ node {
             testResults: '**/target/surefire-reports/TEST-*.xml'])
         // Collect up the jacoco execution results
         step([$class: 'JacocoPublisher', 
+            inclusionPattern: "**/org/eclipse/jetty/**/*.class",
             execPattern: '**/target/jacoco.exec', 
             classPattern: '**/target/classes', 
             sourcePattern: '**/src/main/java'])