Merged branch 'jetty-9.1.x' into 'master'.

This commit is contained in:
Simone Bordet 2014-04-16 11:10:18 +02:00
commit 60f2200184
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,9 @@
[name]
npn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar:lib/npn/npn-boot-1.1.7.v20140316.jar
[ini-template]
--exec
-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar

View File

@ -0,0 +1,9 @@
[name]
npn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar:lib/npn/npn-boot-1.1.7.v20140316.jar
[ini-template]
--exec
-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar

12
pom.xml
View File

@ -870,6 +870,18 @@
<alpn.version>8.0.0</alpn.version>
</properties>
</profile>
<profile>
<id>7u55</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_55</value>
</property>
</activation>
<properties>
<npn.version>1.1.7.v20140316</npn.version>
</properties>
</profile>
</profiles>
</project>