From b459c4118beb1ddd5e194a229488b9b7ebc883cd Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 19 Oct 2016 13:15:39 -0700
Subject: [PATCH 1/2] Using new recommended timeout() syntax

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2f70108815d..b45d3fb5216 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ node('linux') {
   {
     stage 'Compile'
     withEnv(mvnEnv) {
-      timeout(15) {
+      timeout(time: 15, unit: 'MINUTES') {
         sh "mvn -B clean install -Dtest=None"
       }
     }
@@ -35,7 +35,7 @@ node('linux') {
   {
     stage 'Javadoc'
     withEnv(mvnEnv) {
-      timeout(15) {
+      timeout(time: 15, unit: 'MINUTES') {
         sh "mvn -B javadoc:javadoc"
       }
     }
@@ -48,7 +48,7 @@ node('linux') {
   {
     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

From 91cbb067f8807e0acd83661a4b9556632980dfa8 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 19 Oct 2016 14:36:59 -0700
Subject: [PATCH 2/2] Limiting jacoco reports to only org.eclipse.jetty classes

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index b45d3fb5216..7f74c792d56 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,6 +56,7 @@ node('linux') {
             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'])