Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1901 Backport some java9 support to 9.3

This commit is contained in:
Greg Wilkins 2017-10-17 17:14:18 +11:00
parent a9e98a5a7e
commit dd0eaa0f1f
2 changed files with 3 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -471,7 +471,7 @@ public class AnnotationParser
return new MyFieldVisitor(_handlers, _ci, access, fieldName, fieldType, signature, value); return new MyFieldVisitor(_handlers, _ci, access, fieldName, fieldType, signature, value);
} }
} }
/** /**
* Add a class as having been parsed. * Add a class as having been parsed.
* *
@ -653,7 +653,7 @@ public class AnnotationParser
* Parse all classes in a directory * Parse all classes in a directory
* *
* @param handlers the set of handlers to look for classes in * @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 * @param resolver the class name resolver
* @throws Exception if unable to parse * @throws Exception if unable to parse
*/ */
@ -860,6 +860,7 @@ public class AnnotationParser
* Parse a single entry in a jar file * Parse a single entry in a jar file
* *
* @param handlers the handlers to look for classes in * @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 entry the entry in the potentially MultiRelease jar resource to parse
* @param resolver the class name resolver * @param resolver the class name resolver
* @throws Exception if unable to parse * @throws Exception if unable to parse

67
jetty-util/pom.xml
View File

@ -11,8 +11,6 @@
<url>http://www.eclipse.org/jetty</url> <url>http://www.eclipse.org/jetty</url>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name> <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> </properties>
<build> <build>
<plugins> <plugins>
@ -59,69 +57,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>