Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod
new file mode 100644
index 0000000..fdd3868
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[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
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
index 7dd8f01..0a65b98 100644
--- a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
@@ -244,6 +244,7 @@
|1.8.0u111 |8.1.9.v20160720
|1.8.0u112 |8.1.10.v20161026
|1.8.0u121 |8.1.11.v20170118
+|1.8.0u131 |8.1.11.v20170118
|=============================
[[alpn-build]]
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index fcb3fbc..4a2489a 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -15,7 +15,6 @@
<url>http://www.eclipse.org/jetty</url>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod
new file mode 100644
index 0000000..fdd3868
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[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
diff --git a/pom.xml b/pom.xml
index b2bd065..512ee9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1208,5 +1208,17 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>8u131</id>
+ <activation>
+ <property>
+ <name>java.version</name>
+ <value>1.8.0_131</value>
+ </property>
+ </activation>
+ <properties>
+ <alpn.version>8.1.11.v20170118</alpn.version>
+ </properties>
+ </profile>
</profiles>
</project>
