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

Jenkinsfile

@@ -1,3 +1,5 @@
+#!groovy
+
 node {
   // System Dependent Locations
   def mvntool = tool name: 'maven3', type: 'hudson.tasks.Maven$MavenInstallation'

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_121.mod

@@ -0,0 +1,5 @@
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc

@@ -243,6 +243,7 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |1.8.0u102 |8.1.9.v20160720
 |1.8.0u111 |8.1.9.v20160720
 |1.8.0u112 |8.1.10.v20161026
+|1.8.0u121 |8.1.11.v20170118
 |=============================
 
 [[alpn-build]]

jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java

@@ -118,7 +118,8 @@ public class DumpHandler extends AbstractHandler.ErrorDispatchHandler
             String name=headers.nextElement();
             writer.write(name);
             writer.write(": ");
-            writer.write(request.getHeader(name));
+            String value = request.getHeader(name);
+            writer.write(value == null?"":value);
             writer.write("\n");
         }
         writer.write("</pre>\n<h3>Parameters:</h3>\n<pre>");

jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java

@@ -16,12 +16,6 @@
 //  ========================================================================
 //
 
-/*
- * Created on 9/01/2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 package org.eclipse.jetty.server;
 
 import static org.hamcrest.Matchers.containsString;
@@ -50,9 +44,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/**
- *
- */
 @RunWith(AdvancedRunner.class)
 public class PartialRFC2616Test
 {

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_121.mod

@@ -0,0 +1,5 @@
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

pom.xml

@@ -1423,6 +1423,18 @@
         <alpn.version>8.1.10.v20161026</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u121</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_121</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.11.v20170118</alpn.version>
+      </properties>
+    </profile>
   </profiles>
 
   <issueManagement>