Initial support for JDK 8 builds.

Added ALPN version and moved jetty-osgi module to a profile, only
built when using JDK 7.
This commit is contained in:
Simone Bordet 2014-03-18 23:58:05 +01:00
parent f4e4b093d4
commit addc49f391
1 changed files with 153 additions and 132 deletions

23
pom.xml
View File

@ -434,7 +434,6 @@
<module>jetty-client</module>
<module>jetty-proxy</module>
<module>jetty-jaspi</module>
<module>jetty-osgi</module>
<module>jetty-rewrite</module>
<module>jetty-nosql</module>
<module>jetty-quickstart</module>
@ -814,6 +813,15 @@
</plugins>
</build>
</profile>
<profile>
<id>osgi</id>
<activation>
<jdk>[1.7,1.8)</jdk>
</activation>
<modules>
<module>jetty-osgi</module>
</modules>
</profile>
<profile>
<id>7u9</id>
<activation>
@ -944,6 +952,19 @@
</activation>
<properties>
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0</alpn.version>
</properties>
</profile>
<profile>
<id>8u00</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0</value>
</property>
</activation>
<properties>
<alpn.version>8.0.0</alpn.version>
</properties>
</profile>
</profiles>