andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Jetty ALNPN and NPN updates plus backport

Browse Source 
Motivation:
There are new versions of the ALPN and NPN dependencies.  There was also some backport misses in the pom file related to ALPN/NPN.

Modifications:
- Add new versions for ALPN/NPN dependencies.
- Backport missed pieces from pom.xml.

Result:
Updated version of ALPN/NPN versions.
This commit is contained in:
Scott Mitchell 2015-03-19 17:33:14 -07:00
parent d7581e5726
commit c81937dff3
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pom.xml
View File

@ -170,6 +170,18 @@
<jetty.alpn.version>8.1.2.v20141202</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u31</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_31</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>linux</id>
<activation>
@ -447,6 +459,32 @@
<jetty.alpn.version>7.1.2.v20141202</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>npn-alpn-7u75</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_75</value>
</property>
</activation>
<properties>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.alpn.version>7.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>npn-alpn-7u76</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_76</value>
</property>
</activation>
<properties>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.alpn.version>7.1.3.v20150130</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.
@ -470,9 +508,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jboss.marshalling.version>1.3.18.GA</jboss.marshalling.version>
<jetty.npn.version>1.1.9.v20141016</jetty.npn.version>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.npn.path>${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${jetty.npn.version}/npn-boot-${jetty.npn.version}.jar</jetty.npn.path>
<jetty.alpn.version>8.1.2.v20141202</jetty.alpn.version>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
<jetty.alpn.path>${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${jetty.alpn.version}/alpn-boot-${jetty.alpn.version}.jar</jetty.alpn.path>
<argLine.common>
-server