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

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

@@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.9.v20160720/alpn-boot-8.1.9.v20160720.jar|lib/alpn/alpn-boot-8.1.9.v20160720.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

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

@@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.9.v20160720/alpn-boot-8.1.9.v20160720.jar|lib/alpn/alpn-boot-8.1.9.v20160720.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

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

@@ -248,6 +248,8 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |1.8.0u77 |8.1.7.v20160121
 |1.8.0u91 |8.1.7.v20160121
 |1.8.0u92 |8.1.8.v20160420
+|1.8.0u101 |8.1.9.v20160720
+|1.8.0u102 |8.1.9.v20160720
 |=============================
 
 [[alpn-build]]

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

@@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.9.v20160720/alpn-boot-8.1.9.v20160720.jar|lib/alpn/alpn-boot-8.1.9.v20160720.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

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

@@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.9.v20160720/alpn-boot-8.1.9.v20160720.jar|lib/alpn/alpn-boot-8.1.9.v20160720.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

pom.xml

@@ -18,7 +18,7 @@
     <build-support-version>1.4</build-support-version>
     <slf4j-version>1.6.6</slf4j-version>
     <jetty-test-policy-version>1.2</jetty-test-policy-version>
-    <alpn.api.version>1.1.2.v20150522</alpn.api.version>
+    <alpn.api.version>1.1.3.v20160715</alpn.api.version>
     <jsp.version>8.0.33</jsp.version>
     <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
     <alpn.version>undefined</alpn.version>
@@ -1371,6 +1371,30 @@
         <alpn.version>8.1.8.v20160420</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u101</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_101</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.9.v20160720</alpn.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>8u102</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_102</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.9.v20160720</alpn.version>
+      </properties>
+    </profile>
   </profiles>
 
   <issueManagement>