From 2a416bbc6bd892c9fa0c6f7a84386b67a26557fc Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 12 Jan 2017 19:59:11 +0100
Subject: [PATCH] Issue #1073 - JDK9 support in Jetty 9.3.x.

Fixed the compact3 profile and other small fixes.
---
 aggregates/jetty-all-compact3/pom.xml         | 40 +++++++------------
 .../main/config/modules/alpn-impl/alpn-8.mod  |  6 ++-
 .../src/main/config/modules/alpn.mod          |  4 --
 pom.xml                                       |  2 +
 4 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml
index 1762a9555e9..7970f87b428 100644
--- a/aggregates/jetty-all-compact3/pom.xml
+++ b/aggregates/jetty-all-compact3/pom.xml
@@ -78,32 +78,22 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins
-        </groupId>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>package</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <archive>
-                <manifest>
-                </manifest>
-                <manifestEntries>
-                  <mode>development</mode>
-                  <url>http://eclipse.org/jetty</url>
-                  <Built-By>${user.name}</Built-By>
-                  <package>org.eclipse.jetty</package>
-                  <Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>
-                  <Bundle-Name>Jetty</Bundle-Name>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
-        </executions>
+        <configuration>
+          <archive>
+            <manifest>
+            </manifest>
+            <manifestEntries>
+              <mode>development</mode>
+              <url>http://eclipse.org/jetty</url>
+              <Built-By>${user.name}</Built-By>
+              <package>org.eclipse.jetty</package>
+              <Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>
+              <Bundle-Name>Jetty</Bundle-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod
index f03851eca2b..cc0befd31df 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod
@@ -13,12 +13,16 @@
 #            Jetty project in order to provide support for these future
 #            Java versions.
 #
-# All versions of alpn-boot can be found at
+# All versions of the alpn-boot jar can be found at
 # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
 
 [depend]
 alpn-impl/alpn-${java.version}
 
+[files]
+lib/
+lib/alpn/
+
 [license]
 ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
 ALPN replaces/modifies OpenJDK classes in the sun.security.ssl package.
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
index cb3f0837612..a16dbf5082c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -9,10 +9,6 @@ lib/jetty-alpn-server-${jetty.version}.jar
 [xml]
 etc/jetty-alpn.xml
 
-[files]
-lib/
-lib/alpn/
-
 [ini-template]
 ## Overrides the order protocols are chosen by the server.
 ## The default order is that specified by the order of the
diff --git a/pom.xml b/pom.xml
index eba667ce321..0cdb089a67f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,6 +365,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.4</version>
           <configuration>
             <docfilessubdirs>true</docfilessubdirs>
             <detectLinks>false</detectLinks>
@@ -488,6 +489,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
+          <version>3.0.1</version>
           <extensions>true</extensions>
           <configuration>
             <supportedProjectTypes>