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
This commit is contained in:
Scott Mitchell 2015-11-23 12:46:32 -08:00
parent 7c5a1178b5
commit 4979c04149

15
pom.xml
View File

@ -204,7 +204,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>
@ -580,6 +580,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.
@ -681,6 +693,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>