From 66d969b453307b05569880fbbb8ba1af57fab3d3 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Tue, 20 May 2014 22:37:55 +0900
Subject: [PATCH] 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.
---
 example/pom.xml | 1 +
 pom.xml         | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/example/pom.xml b/example/pom.xml
index c44e9e3b15..833ebbe7de 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -142,6 +142,7 @@
           <executable>${java.home}/bin/java</executable>
           <commandlineArgs>
             ${argLine.common}
+            ${argLine.bootcp}
             ${argLine.leak}
             ${argLine.coverage}
             -classpath %classpath
diff --git a/pom.xml b/pom.xml
index 761cfbad7b..14cd9f4464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,14 +100,16 @@
         </plugins>
       </build>
     </profile>
-    <!-- Our Javadoc has poor enough quality to fail the build thanks to JDK8 javadoc which got more strict. -->
     <profile>
       <id>jdk8</id>
       <activation>
         <jdk>[1.8,)</jdk>
       </activation>
       <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>
+        <!-- npn-boot does not work with JDK 8 -->
+        <argLine.bootcp>-D_</argLine.bootcp>
       </properties>
     </profile>
     <profile>
@@ -314,7 +316,6 @@
     <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>
     <argLine.common>
-      -Xbootclasspath/p:${jetty.npn.path}
       -server
       -dsa -da -ea:io.netty...
       -XX:+AggressiveOpts
@@ -325,6 +326,7 @@
       -XX:+HeapDumpOnOutOfMemoryError
       -verbose:gc
     </argLine.common>
+    <argLine.bootcp>-Xbootclasspath/p:${jetty.npn.path}</argLine.bootcp>
     <argLine.leak>-D_</argLine.leak> <!-- Set when 'leak' profile is active -->
     <argLine.coverage>-D_</argLine.coverage> <!-- Set when 'coverage' profile is active -->
   </properties>
@@ -736,7 +738,7 @@
             <exclude>**/TestUtil*</exclude>
           </excludes>
           <runOrder>random</runOrder>
-          <argLine>${argLine.common} ${argLine.leak} ${argLine.coverage}</argLine>
+          <argLine>${argLine.common} ${argLine.bootcp} ${argLine.leak} ${argLine.coverage}</argLine>
         </configuration>
       </plugin>
       <!-- always produce osgi bundles -->