Fix a build problem with JDK 8

Motivation:

Build fails with JDK 8 because npn-boot does not work with JDK 8

Modifications:

Do not specify bootclasspath when on JDK 8

Result:

Build is green again.
This commit is contained in:
Trustin Lee 2014-05-20 22:37:55 +09:00
parent 59f3d550fe
commit 66d969b453
2 changed files with 6 additions and 3 deletions

View File

@ -142,6 +142,7 @@
<executable>${java.home}/bin/java</executable> <executable>${java.home}/bin/java</executable>
<commandlineArgs> <commandlineArgs>
${argLine.common} ${argLine.common}
${argLine.bootcp}
${argLine.leak} ${argLine.leak}
${argLine.coverage} ${argLine.coverage}
-classpath %classpath -classpath %classpath

View File

@ -100,14 +100,16 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- Our Javadoc has poor enough quality to fail the build thanks to JDK8 javadoc which got more strict. -->
<profile> <profile>
<id>jdk8</id> <id>jdk8</id>
<activation> <activation>
<jdk>[1.8,)</jdk> <jdk>[1.8,)</jdk>
</activation> </activation>
<properties> <properties>
<!-- Our Javadoc has poor enough quality to fail the build thanks to JDK8 javadoc which got more strict. -->
<maven.javadoc.failOnError>false</maven.javadoc.failOnError> <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<!-- npn-boot does not work with JDK 8 -->
<argLine.bootcp>-D_</argLine.bootcp>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@ -314,7 +316,6 @@
<jetty.npn.version>1.1.7.v20140316</jetty.npn.version> <jetty.npn.version>1.1.7.v20140316</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.npn.path>${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${jetty.npn.version}/npn-boot-${jetty.npn.version}.jar</jetty.npn.path>
<argLine.common> <argLine.common>
-Xbootclasspath/p:${jetty.npn.path}
-server -server
-dsa -da -ea:io.netty... -dsa -da -ea:io.netty...
-XX:+AggressiveOpts -XX:+AggressiveOpts
@ -325,6 +326,7 @@
-XX:+HeapDumpOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError
-verbose:gc -verbose:gc
</argLine.common> </argLine.common>
<argLine.bootcp>-Xbootclasspath/p:${jetty.npn.path}</argLine.bootcp>
<argLine.leak>-D_</argLine.leak> <!-- Set when 'leak' profile is active --> <argLine.leak>-D_</argLine.leak> <!-- Set when 'leak' profile is active -->
<argLine.coverage>-D_</argLine.coverage> <!-- Set when 'coverage' profile is active --> <argLine.coverage>-D_</argLine.coverage> <!-- Set when 'coverage' profile is active -->
</properties> </properties>
@ -736,7 +738,7 @@
<exclude>**/TestUtil*</exclude> <exclude>**/TestUtil*</exclude>
</excludes> </excludes>
<runOrder>random</runOrder> <runOrder>random</runOrder>
<argLine>${argLine.common} ${argLine.leak} ${argLine.coverage}</argLine> <argLine>${argLine.common} ${argLine.bootcp} ${argLine.leak} ${argLine.coverage}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<!-- always produce osgi bundles --> <!-- always produce osgi bundles -->