From dc13a10e7783dfb461a58e431098617a191afd1e Mon Sep 17 00:00:00 2001
From: Scott Mitchell <scott_mitchell@apple.com>
Date: Mon, 23 Nov 2015 12:46:32 -0800
Subject: [PATCH] update pom due to alpn provided

Motiviation:
According to jetty docs the alpn-api should use the provided scope.

Modificaitons:
- change scope to provided for alpn-api
- update for new jdk

Result:
Users of Netty don't run into alpn version conflicts.
Fixes https://github.com/netty/netty/issues/4480
---
 pom.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1134afcb1e..42f671cbba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <properties>
-        <jetty.alpn.version>8.1.5.v20150921</jetty.alpn.version>
+        <jetty.alpn.version>8.1.6.v20151105</jetty.alpn.version>
       </properties>
     </profile>
     <profile>
@@ -575,6 +575,18 @@
         <jetty.alpn.version>8.1.5.v20150921</jetty.alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>alpn-8u65</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_65</value>
+        </property>
+      </activation>
+      <properties>
+        <jetty.alpn.version>8.1.6.v20151105</jetty.alpn.version>
+      </properties>
+    </profile>
     <profile>
       <!--
       This profile exists because either ALPN or NPN can exits on the class path at once, but not both.
@@ -685,6 +697,7 @@
         <groupId>org.eclipse.jetty.alpn</groupId>
         <artifactId>alpn-api</artifactId>
         <version>1.1.2.v20150522</version>
+        <scope>provided</scope> <!-- Provided by alpn-boot -->
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty.alpn</groupId>