Merged branch 'master' into 'jetty-9.1'.
This commit is contained in:
commit
c49ba7bdcc
|
@ -113,6 +113,18 @@
|
||||||
<npn.version>1.1.5.v20130313</npn.version>
|
<npn.version>1.1.5.v20130313</npn.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>7u40</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>java.version</name>
|
||||||
|
<value>1.7.0_40</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<npn.version>1.1.6.v20130911</npn.version>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|
Loading…
Reference in New Issue