From 489f68c7080638c54eeab2a396a81025a46cb87a Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Mon, 24 Jul 2017 10:08:10 +0200
Subject: [PATCH] Fixes #1685 - Update ALPN support for Java 8u141.

---
 .../config/modules/protonego-impl/alpn-1.8.0_141.mod |  8 ++++++++
 .../modules/protonego-impl/alpn-1.8.0_141.mod        |  8 ++++++++
 pom.xml                                              | 12 ++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_141.mod
 create mode 100644 jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_141.mod

diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_141.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_141.mod
new file mode 100644
index 00000000000..fdd3868701d
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_141.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-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_141.mod b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_141.mod
new file mode 100644
index 00000000000..fdd3868701d
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_141.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 4bf8f67c652..f060d64f768 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1552,6 +1552,18 @@
         <alpn.version>8.1.11.v20170118</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u141</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_141</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.11.v20170118</alpn.version>
+      </properties>
+    </profile>
   </profiles>
 
   <issueManagement>