From dd0eaa0f1fb7ebc31db9d0b9f81e3baef0aa74b2 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Tue, 17 Oct 2017 17:14:18 +1100
Subject: [PATCH] Issue #1901 Backport some java9 support to 9.3

---
 .../jetty/annotations/AnnotationParser.java   |  5 +-
 jetty-util/pom.xml                            | 67 -------------------
 2 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
index f8752d9866a..d1c8d984bda 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
@@ -471,7 +471,7 @@ public class AnnotationParser
             return new MyFieldVisitor(_handlers, _ci, access, fieldName, fieldType, signature, value);
         }
     }
-
+    
     /**
      * Add a class as having been parsed.
      * 
@@ -653,7 +653,7 @@ public class AnnotationParser
      * Parse all classes in a directory
      * 
      * @param handlers the set of handlers to look for classes in 
-     * @param dir the resource directory to look for classes
+     * @param root the resource directory to look for classes
      * @param resolver the class name resolver
      * @throws Exception if unable to parse
      */
@@ -860,6 +860,7 @@ public class AnnotationParser
      * Parse a single entry in a jar file
      * 
      * @param handlers the handlers to look for classes in  
+     * @param jar The jar from which entry was obtained
      * @param entry the entry in the potentially MultiRelease jar resource to parse
      * @param resolver the class name resolver
      * @throws Exception if unable to parse
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 5d408646ed3..8340023f99c 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -11,8 +11,6 @@
   <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name>
-    <java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
-    <java9.build.outputDirectory>${project.build.directory}/classes-java9</java9.build.outputDirectory>
   </properties>
   <build>
     <plugins>
@@ -59,69 +57,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-    <id>jdk9 MR Jar</id>
-    <activation>
-      <jdk>[1.9,)</jdk>
-    </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>compile-java9</id>
-                <phase>compile</phase>
-                <configuration>
-                  <tasks>
-                    <mkdir dir="${java9.build.outputDirectory}" />
-                    <javac target="1.9" srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
-                           classpath="${project.build.directory}/classes" includeantruntime="false" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-resources</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${java9.build.outputDirectory}</directory>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <archive>
-                <manifestEntries>
-                  <Multi-Release>true</Multi-Release>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>