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

Jenkinsfile

@@ -9,8 +9,9 @@ node {
 
   try
   {
-    stage 'Checkout'
+    stage('Checkout') {
       checkout scm
+    }
   } catch (Exception e) {
     notifyBuild("Checkout Failure")
     throw e
@@ -18,12 +19,13 @@ node {
 
   try
   {
-    stage 'Compile'
+    stage('Compile') {
       withEnv(mvnEnv) {
         timeout(time: 15, unit: 'MINUTES') {
           sh "mvn -B clean install -Dtest=None"
         }
       }
+    }
   } catch(Exception e) {
     notifyBuild("Compile Failure")
     throw e
@@ -31,12 +33,13 @@ node {
 
   try
   {
-    stage 'Javadoc'
+    stage('Javadoc') {
       withEnv(mvnEnv) {
         timeout(time: 15, unit: 'MINUTES') {
           sh "mvn -B javadoc:javadoc"
         }
       }
+    }
   } catch(Exception e) {
     notifyBuild("Javadoc Failure")
     throw e
@@ -44,7 +47,7 @@ node {
 
   try
   {
-    stage 'Test'
+    stage('Test') {
       withEnv(mvnEnv) {
         timeout(time: 60, unit: 'MINUTES') {
           // Run test phase / ignore test failures
@@ -53,8 +56,27 @@ node {
           step([$class: 'JUnitResultArchiver', 
               testResults: '**/target/surefire-reports/TEST-*.xml'])
           // Collect up the jacoco execution results
+          def jacocoExcludes = 
+              // build tools
+              "**/org/eclipse/jetty/ant/**" +
+              ",**/org/eclipse/jetty/maven/**" +
+              ",**/org/eclipse/jetty/jspc/**" +
+              // example code / documentation
+              ",**/org/eclipse/jetty/embedded/**" +
+              ",**/org/eclipse/jetty/asyncrest/**" +
+              ",**/org/eclipse/jetty/demo/**" +
+              // special environments / late integrations
+              ",**/org/eclipse/jetty/gcloud/**" +
+              ",**/org/eclipse/jetty/infinispan/**" +
+              ",**/org/eclipse/jetty/osgi/**" +
+              ",**/org/eclipse/jetty/spring/**" +
+              ",**/org/eclipse/jetty/http/spi/**" +
+              // test classes
+              ",**/org/eclipse/jetty/tests/**" +
+              ",**/org/eclipse/jetty/test/**";
           step([$class: 'JacocoPublisher', 
-            inclusionPattern: "**/org/eclipse/jetty/**/*.class",
+              inclusionPattern: '**/org/eclipse/jetty/**/*.class',
+              exclusionPattern: jacocoExcludes,
               execPattern: '**/target/jacoco.exec', 
               classPattern: '**/target/classes', 
               sourcePattern: '**/src/main/java'])
@@ -71,6 +93,7 @@ node {
           notifyBuild("Unstable / Test Errors")
         }
       }
+    }
   } catch(Exception e) {
     notifyBuild("Test Failure")
     throw e

apache-jsp/pom.xml

@@ -53,6 +53,13 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

apache-jstl/pom.xml

@@ -22,7 +22,13 @@
              <useSystemClassLoader>false</useSystemClassLoader>
           </configuration>
       </plugin>
-
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

jetty-ant/pom.xml

@@ -33,6 +33,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

jetty-http-spi/pom.xml

@@ -52,6 +52,13 @@
               </instructions>
             </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

jetty-jspc-maven-plugin/pom.xml

@@ -35,6 +35,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

jetty-maven-plugin/pom.xml

@@ -36,6 +36,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

jetty-osgi/pom.xml

@@ -70,6 +70,13 @@
           </sourceExcludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencyManagement>

jetty-spring/pom.xml

@@ -17,6 +17,13 @@
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

pom.xml

@@ -177,6 +177,27 @@
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <version>0.7.7.201606060606</version>
+        <configuration>
+          <excludes>
+            <!-- build tools -->
+            <exclude>**/org/eclipse/jetty/ant/**</exclude>
+            <exclude>**/org/eclipse/jetty/maven/**</exclude>
+            <exclude>**/org/eclipse/jetty/jspc/**</exclude>
+            <!-- example code / documentation -->
+            <exclude>**/org/eclipse/jetty/embedded/**</exclude>
+            <exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
+            <exclude>**/org/eclipse/jetty/demo/**</exclude>
+            <!-- special environments / late integrations -->
+            <exclude>**/org/eclipse/jetty/gcloud/**</exclude>
+            <exclude>**/org/eclipse/jetty/infinispan/**</exclude>
+            <exclude>**/org/eclipse/jetty/osgi/**</exclude>
+            <exclude>**/org/eclipse/jetty/spring/**</exclude>
+            <exclude>**/org/eclipse/jetty/http/spi/**</exclude>
+            <!-- test classes -->
+            <exclude>**/org/eclipse/jetty/tests/**</exclude>
+            <exclude>**/org/eclipse/jetty/test/**</exclude>
+          </excludes>
+        </configuration>
         <executions>
           <execution>
             <id>jacoco-initialize</id>
@@ -191,6 +212,16 @@
             <goals>
               <goal>report</goal>
             </goals>
+            <configuration>
+              <!-- list of classes that you want to see in the report.
+                   Specify a narrow list of multi-module project
+                   classes you want to see here. 
+                   This is useful to remove 3rd party library classes
+                   from the report. -->
+              <includes>
+                <include>**/org/eclipse/jetty/**</include>
+              </includes>
+            </configuration>
           </execution>
         </executions>
       </plugin>

tests/test-webapps/pom.xml

@@ -38,6 +38,13 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <modules>