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

285
pom.xml
View File

@ -434,7 +434,6 @@
<module>jetty-client</module> <module>jetty-client</module>
<module>jetty-proxy</module> <module>jetty-proxy</module>
<module>jetty-jaspi</module> <module>jetty-jaspi</module>
<module>jetty-osgi</module>
<module>jetty-rewrite</module> <module>jetty-rewrite</module>
<module>jetty-nosql</module> <module>jetty-nosql</module>
<module>jetty-quickstart</module> <module>jetty-quickstart</module>
@ -815,137 +814,159 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>7u9</id> <id>osgi</id>
<activation> <activation>
<property> <jdk>[1.7,1.8)</jdk>
<name>java.version</name> </activation>
<value>1.7.0_9</value> <modules>
</property> <module>jetty-osgi</module>
</activation> </modules>
<properties> </profile>
<npn.version>1.1.3.v20130313</npn.version> <profile>
</properties> <id>7u9</id>
</profile> <activation>
<profile> <property>
<id>7u10</id> <name>java.version</name>
<activation> <value>1.7.0_9</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_10</value> <properties>
</property> <npn.version>1.1.3.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.3.v20130313</npn.version> <profile>
</properties> <id>7u10</id>
</profile> <activation>
<profile> <property>
<id>7u11</id> <name>java.version</name>
<activation> <value>1.7.0_10</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_11</value> <properties>
</property> <npn.version>1.1.3.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.3.v20130313</npn.version> <profile>
</properties> <id>7u11</id>
</profile> <activation>
<profile> <property>
<id>7u13</id> <name>java.version</name>
<activation> <value>1.7.0_11</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_13</value> <properties>
</property> <npn.version>1.1.3.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.4.v20130313</npn.version> <profile>
</properties> <id>7u13</id>
</profile> <activation>
<profile> <property>
<id>7u15</id> <name>java.version</name>
<activation> <value>1.7.0_13</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_15</value> <properties>
</property> <npn.version>1.1.4.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.5.v20130313</npn.version> <profile>
</properties> <id>7u15</id>
</profile> <activation>
<profile> <property>
<id>7u17</id> <name>java.version</name>
<activation> <value>1.7.0_15</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_17</value> <properties>
</property> <npn.version>1.1.5.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.5.v20130313</npn.version> <profile>
</properties> <id>7u17</id>
</profile> <activation>
<profile> <property>
<id>7u21</id> <name>java.version</name>
<activation> <value>1.7.0_17</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_21</value> <properties>
</property> <npn.version>1.1.5.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.5.v20130313</npn.version> <profile>
</properties> <id>7u21</id>
</profile> <activation>
<profile> <property>
<id>7u25</id> <name>java.version</name>
<activation> <value>1.7.0_21</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_25</value> <properties>
</property> <npn.version>1.1.5.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.5.v20130313</npn.version> <profile>
</properties> <id>7u25</id>
</profile> <activation>
<profile> <property>
<id>7u40</id> <name>java.version</name>
<activation> <value>1.7.0_25</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_40</value> <properties>
</property> <npn.version>1.1.5.v20130313</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.6.v20130911</npn.version> <profile>
</properties> <id>7u40</id>
</profile> <activation>
<profile> <property>
<id>7u45</id> <name>java.version</name>
<activation> <value>1.7.0_40</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_45</value> <properties>
</property> <npn.version>1.1.6.v20130911</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.6.v20130911</npn.version> <profile>
</properties> <id>7u45</id>
</profile> <activation>
<profile> <property>
<id>7u51</id> <name>java.version</name>
<activation> <value>1.7.0_45</value>
<property> </property>
<name>java.version</name> </activation>
<value>1.7.0_51</value> <properties>
</property> <npn.version>1.1.6.v20130911</npn.version>
</activation> </properties>
<properties> </profile>
<npn.version>1.1.6.v20130911</npn.version> <profile>
</properties> <id>7u51</id>
</profile> <activation>
<property>
<name>java.version</name>
<value>1.7.0_51</value>
</property>
</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> </profiles>
</project> </project>