Add more profiles for newer JDK versions

Modifications:

- Add jetty.npn.version.latest and jetty.alpn.version.latest7/8
- Add npn-alpn-7 profile
- Use the *.latest7/8 version properties in alpn-8 and npn-alpn-7
- Add more profiles for newer JDK versions
- Reorder profiles
This commit is contained in:
Trustin Lee 2015-05-04 14:25:18 +09:00
parent 3064e6dba8
commit 37dc6a41a6

214
pom.xml
View File

@ -110,78 +110,6 @@
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
</properties>
</profile>
<profile>
<id>alpn-8</id>
<activation>
<property>
<name>java.version</name>
<value>1.8</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u05</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_05</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u11</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_11</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u20</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_20</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u25</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_25</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.2.v20141202</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u31</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_31</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>linux</id>
<activation>
@ -246,6 +174,31 @@
See: http://www.eclipse.org/jetty/documentation/current/npn-chapter.html#npn-versions
See: http://www.eclipse.org/jetty/documentation/current/alpn-chapter.html#alpn-versions
-->
<profile>
<id>npn-alpn-7</id>
<activation>
<property>
<name>java.version</name>
<value>1.7</value>
</property>
</activation>
<properties>
<jetty.npn.version>${jetty.npn.version.latest}</jetty.npn.version>
<jetty.alpn.version>${jetty.alpn.version.latest7}</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8</id>
<activation>
<property>
<name>java.version</name>
<value>1.8</value>
</property>
</activation>
<properties>
<jetty.alpn.version>${jetty.alpn.version.latest8}</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>npn-7u9</id>
<activation>
@ -485,6 +438,116 @@
<jetty.alpn.version>7.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>npn-alpn-7u79</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_79</value>
</property>
</activation>
<properties>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.alpn.version>7.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>npn-alpn-7u80</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_80</value>
</property>
</activation>
<properties>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.alpn.version>7.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u05</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_05</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u11</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_11</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u20</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_20</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.0.v20141016</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u25</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_25</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.2.v20141202</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u31</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_31</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u40</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_40</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<id>alpn-8u45</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_45</value>
</property>
</activation>
<properties>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
</properties>
</profile>
<profile>
<!--
This profile exists because either ALPN or NPN can exits on the class path at once, but not both.
@ -508,9 +571,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jboss.marshalling.version>1.3.18.GA</jboss.marshalling.version>
<jetty.npn.version>1.1.10.v20150130</jetty.npn.version>
<jetty.npn.version.latest>1.1.10.v20150130</jetty.npn.version.latest>
<jetty.alpn.version.latest7>7.1.3.v20150130</jetty.alpn.version.latest7>
<jetty.alpn.version.latest8>8.1.3.v20150130</jetty.alpn.version.latest8>
<jetty.npn.version>${jetty.npn.version.latest}</jetty.npn.version>
<jetty.npn.path>${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${jetty.npn.version}/npn-boot-${jetty.npn.version}.jar</jetty.npn.path>
<jetty.alpn.version>8.1.3.v20150130</jetty.alpn.version>
<jetty.alpn.version>${jetty.alpn.version.latest7}</jetty.alpn.version>
<jetty.alpn.path>${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${jetty.alpn.version}/alpn-boot-${jetty.alpn.version}.jar</jetty.alpn.path>
<argLine.common>
-server