Merged branch 'jetty-9.1.x' into 'master'.
This commit is contained in:
commit
60f2200184
|
@ -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
|
|
@ -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
12
pom.xml
|
@ -870,6 +870,18 @@
|
||||||
<alpn.version>8.0.0</alpn.version>
|
<alpn.version>8.0.0</alpn.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</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>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue