Merge branch '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())
       {

jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc

@@ -17,4 +17,4 @@
 [[upgrading-jetty]]
 == Upgrading Jetty
 
-=== TBD
+include::upgrading-9.3-to-9.4.adoc[]

jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc

@@ -1,23 +0,0 @@
-//  ========================================================================
-//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
-//  ========================================================================
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-
-= Sample Title
-
-This is a sample paragraph.
-
-== Sample Subsection
-
-More sample text.

jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc

@@ -0,0 +1,77 @@
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ========================================================================
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+
+=== Upgrading from Jetty 9.3 to Jetty 9.4
+
+==== jetty.sh
+
+The file `jetty.sh`, typically used to start Jetty as a service in Linux/Unix
+machines underwent only small changes, such as the addition of
+https://wiki.debian.org/LSBInitScripts[LSB tags].
+
+You can safely replace Jetty 9.3's `jetty.sh` with 9.4's.
+
+==== Modules No Longer Available
+
+[cols="1,1", options="header"]
+|===
+| 9.3 Module | 9.4 Module
+| logging    | console-capture
+|===
+
+The module `logging` is no longer available in Jetty 9.4.
+
+The logging module structure present in Jetty 9.3 has been replaced with
+a more fine-grained structure in Jetty 9.4, so that you have now more choices
+available that are also easier to configure.
+
+The migration path is different depending on whether you have completely
+customized this module or not.
+
+If you have a Jetty 9.3 installation, and you have both
+`$jetty.base/modules/logging.mod` and `$jetty.base/etc/jetty-logging.xml`,
+then this module is local to your `$jetty.base` setup and will be used
+by Jetty 9.4 as before.
+No changes required on your part.
+
+If either `$jetty.base/modules/logging.mod` or `$jetty.base/etc/jetty-logging.xml`
+are missing, then you were relying on those present in `$jetty.home`,
+which were present in Jetty 9.3, but are no longer available in Jetty 9.4.
+
+The Jetty 9.3 `logging` module has been renamed to `console-capture` in Jetty 9.4.
+You need to open your Jetty 9.3 `start.ini` and replace the references to the
+`logging` modules with `console-capture`.
+
+For example:
+
+.start.ini
+----
+--module=logging
+jetty.logging.retainDays=7
+----
+
+should be replaced by:
+
+.start.ini
+----
+--module=console-capture
+jetty.console-capture.retainDays=7
+----
+
+The properties that may be present in your Jetty 9.3's `start.ini`, such as
+`jetty.logging.retainDays` will still be working in Jetty 9.4, but a warning
+will be printed at Jetty 9.4 startup, saying to replace them with correspondent
+`jetty.console-capture.*` properties such as `jetty.console-capture.retainDays`.

jetty-util/src/main/config/modules/jul-slf4j.mod

@@ -6,11 +6,11 @@ logging
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 slf4j-impl
 
-[provide]
+[provides]
 jul-impl
 
 [files]

jetty-util/src/main/config/modules/log4j-impl.mod

@@ -20,7 +20,7 @@ maven://log4j/log4j/${log4j.version}|lib/log4j/log4j-${log4j.version}.jar
 logs/
 
 [lib]
-lib/log4j/*.jar
+lib/log4j/log4j-${log4j.version}.jar
 
 [license]
 Log4j is released under the Apache 2.0 license.

jetty-util/src/main/config/modules/log4j2-api.mod

@@ -7,11 +7,14 @@ log4j2
 log4j
 internal
 
+[provides]
+log4j2-api
+
 [files]
-maven://org.apache.logging.log4j/log4j-api/${log4j2.version}|lib/log4j/log4j-api-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-api/${log4j2.version}|lib/log4j2/log4j-api-${log4j2.version}.jar
 
 [lib]
-lib/log4j/log4j-api-${log4j2.version}.jar
+lib/log4j2/log4j-api-${log4j2.version}.jar
 
 [license]
 Log4j is released under the Apache 2.0 license.

jetty-util/src/main/config/modules/log4j2-slf4j.mod

@@ -16,8 +16,8 @@ slf4j-api
 log4j2-impl
 
 [files]
-maven://org.apache.logging.log4j/log4j-to-slf4j/${log4j2.version}|lib/log4j/log4j-to-slf4j-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-to-slf4j/${log4j2.version}|lib/log4j2/log4j-to-slf4j-${log4j2.version}.jar
 
 [lib]
-lib/log4j/log4j-slf4j-to-${log4j2.version}.jar
+lib/log4j2/log4j-slf4j-to-${log4j2.version}.jar
 

jetty-util/src/main/config/modules/logback-impl.mod

@@ -15,7 +15,7 @@ basehome:modules/logback/logback.xml|resources/logback.xml
 logs/
 
 [lib]
-lib/logback/*.jar
+lib/logback/logback-core-${logback.version}.jar
 
 [license]
 Logback: the reliable, generic, fast and flexible logging framework.

jetty-util/src/main/config/modules/logging-jcl.mod

@@ -9,11 +9,11 @@ logging
 slf4j-jcl
 jcl-impl
 
-[provide]
+[provides]
 logging
 
 [exec]
 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/jul
+jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/jul/

jetty-util/src/main/config/modules/logging-jetty.mod

@@ -9,7 +9,7 @@ logging
 resources
 console-capture
 
-[provide]
+[provides]
 logging
 
 [files]

jetty-util/src/main/config/modules/logging-jul.mod

@@ -9,7 +9,7 @@ logging
 slf4j-jul
 jul-impl
 
-[provide]
+[provides]
 logging
 
 [exec]

jetty-util/src/main/config/modules/logging-log4j.mod

@@ -9,7 +9,7 @@ logging
 slf4j-log4j
 log4j-impl
 
-[provide]
+[provides]
 logging
 
 [exec]

jetty-util/src/main/config/modules/logging-log4j2.mod

@@ -9,11 +9,11 @@ logging
 slf4j-log4j2
 log4j2-impl
 
-[provide]
+[provides]
 logging
 
 [exec]
 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/log4j/
+jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/log4j2/

jetty-util/src/main/config/modules/logging-logback.mod

@@ -9,11 +9,11 @@ logging
 slf4j-logback
 logback-impl
 
-[provide]
+[provides]
 logging
 
 [exec]
 -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/logback
+jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/logback/

jetty-util/src/main/config/modules/logging-slf4j.mod

@@ -9,7 +9,7 @@ logging
 slf4j-api
 slf4j-impl
 
-[provide]
+[provides]
 logging
 
 [exec]

jetty-util/src/main/config/modules/slf4j-api.mod

@@ -1,5 +1,5 @@
 [description]
-Provides SLF4J API.  Requires a slf4j implementation (eg slf4j-simple)
+Provides SLF4J API.  Requires a slf4j implementation (eg slf4j-simple-impl)
 otherwise a noop implementation is used.
 
 [tags]

jetty-util/src/main/config/modules/slf4j-jcl.mod

@@ -7,11 +7,11 @@ jcl
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 jcl-impl
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]

jetty-util/src/main/config/modules/slf4j-jul.mod

@@ -6,10 +6,10 @@ logging
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]

jetty-util/src/main/config/modules/slf4j-log4j.mod

@@ -7,12 +7,12 @@ log4j
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 log4j-api
 log4j-impl
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]

jetty-util/src/main/config/modules/slf4j-log4j2.mod

@@ -8,16 +8,16 @@ log4j
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 log4j2-api
 log4j2-impl
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]
-maven://org.apache.logging.log4j/log4j-slf4j-impl/${log4j2.version}|lib/log4j/log4j-slf4j-impl-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-slf4j-impl/${log4j2.version}|lib/log4j2/log4j-slf4j-impl-${log4j2.version}.jar
 
 [lib]
-lib/log4j/log4j-slf4j-impl-${log4j2.version}.jar
+lib/log4j2/log4j-slf4j-impl-${log4j2.version}.jar

jetty-util/src/main/config/modules/slf4j-logback.mod

@@ -6,17 +6,18 @@ logging
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 logback-impl
 resources
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]
-basehome:modules/logback/logback.xml|resources/logback.xml
 maven://ch.qos.logback/logback-classic/${logback.version}|lib/logback/logback-classic-${logback.version}.jar
+basehome:modules/logback/logback.xml|resources/logback.xml
 
 [lib]
 lib/logback/logback-classic-${logback.version}.jar
+

jetty-util/src/main/config/modules/slf4j-simple-impl.mod

@@ -7,11 +7,11 @@ logging
 slf4j
 internal
 
-[depend]
+[depends]
 slf4j-api
 resources
 
-[provide]
+[provides]
 slf4j-impl
 
 [files]
@@ -20,4 +20,4 @@ basehome:modules/slf4j/simplelogger.properties|resources/simplelogger.properties
 logs/
 
 [lib]
-lib/slf4j/*.jar
+lib/slf4j/slf4j-simple-${slf4j.version}.jar

pom.xml

@@ -146,6 +146,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>
@@ -520,9 +541,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>