From b7c4e1c7dccc291c936574d80b7350870e908928 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 16 Aug 2017 12:37:44 +0200
Subject: [PATCH] Issue #487 - JDK 9 build compatibility.

Made sure that when compiling with JDK 9 we actually use a JDK 8 runtime.

Updated the Maven Compiler Plugin to latest version, with support for
JDK 9 --release command line.

Removed unnecessary Maven Compiler Plugin declarations in POMs.
---
 aggregates/jetty-all-compact3/pom.xml         |  2 -
 jetty-alpn/jetty-alpn-java-client/pom.xml     |  1 +
 jetty-alpn/jetty-alpn-java-server/pom.xml     |  1 +
 jetty-osgi/test-jetty-osgi/pom.xml            |  9 ----
 pom.xml                                       | 47 ++++++++++---------
 .../test-webapps/test-mock-resources/pom.xml  |  6 ---
 .../test-container-initializer/pom.xml        |  6 ---
 .../test-web-fragment/pom.xml                 | 14 ++----
 8 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml
index 003a71ebdfb..8bdc308365e 100644
--- a/aggregates/jetty-all-compact3/pom.xml
+++ b/aggregates/jetty-all-compact3/pom.xml
@@ -20,8 +20,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>8</source>
-          <target>8</target>
           <compilerArgs>
             <arg>-profile</arg>
             <arg>compact3</arg>
diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml
index 8b38cd1c701..44ecdae949e 100644
--- a/jetty-alpn/jetty-alpn-java-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-java-client/pom.xml
@@ -24,6 +24,7 @@
                 <configuration>
                     <source>1.9</source>
                     <target>1.9</target>
+                    <release>9</release>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml
index 24c76ea5157..5212730eef8 100644
--- a/jetty-alpn/jetty-alpn-java-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-java-server/pom.xml
@@ -23,6 +23,7 @@
                 <configuration>
                     <source>1.9</source>
                     <target>1.9</target>
+                    <release>9</release>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 7a86699b49e..3b75d064e90 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -390,15 +390,6 @@
           <argLine>-Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar</argLine>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 1c135005442..f0396ea6321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,17 +35,6 @@
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <testSource>1.8</testSource>
-          <testTarget>1.8</testTarget>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <version>2.5</version>
@@ -333,6 +322,15 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.6.2</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -802,17 +800,6 @@
       <modules>
         <module>aggregates/jetty-all</module>
       </modules>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
     <profile>
       <id>ci</id>
@@ -1256,5 +1243,21 @@
         <alpn.version>8.1.11.v20170118</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>jdk9</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <release>8</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 7bded4d7d77..ded8fe8821b 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -13,12 +13,6 @@
   </properties>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
index 3c002117bf9..3838d070d5f 100644
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@@ -13,12 +13,6 @@
   </properties>
   <build>
     <plugins>
-       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-        </configuration>
-       </plugin>
        <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
index e60c2408f97..e538df58e73 100644
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@@ -5,23 +5,15 @@
     <artifactId>test-servlet-spec-parent</artifactId>
     <version>9.3.22-SNAPSHOT</version>
   </parent>
+
   <name>Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar</name>
-  <groupId>org.eclipse.jetty.tests</groupId>
   <artifactId>test-web-fragment</artifactId>
   <packaging>jar</packaging>
+
   <properties>
     <bundle-symbolic-name>${project.groupId}.fragment</bundle-symbolic-name>
   </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
   <dependencies>
       <dependency>
          <groupId>javax.servlet</groupId>