Bug 477291: [1.9] Support JRE 9 in JSR199 implementation

Change-Id: Idfbcd6c2e40fbbc1a325dbe43950284404642fc8
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>

16 files changed, 49 insertions, 3 deletions

diff --git a/org.eclipse.jdt.compiler.apt.tests/.classpath b/org.eclipse.jdt.compiler.apt.tests/.classpath
index 6d510c6323..2dc14fa091 100644
--- a/org.eclipse.jdt.compiler.apt.tests/.classpath
+++ b/org.eclipse.jdt.compiler.apt.tests/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" output="binprocessors" path="processors"/>
 	<classpathentry kind="src" output="binprocessors8" path="processors8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="rtstubs18.jar"/>
+	<classpathentry kind="lib" path="java9/java9api.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
index 31d60e1a90..5db66bc805 100644
--- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
@@ -19,3 +19,5 @@ Export-Package: org.eclipse.jdt.compiler.apt.tests,
  org.eclipse.jdt.compiler.apt.tests.processors.visitors
 Import-Package: org.eclipse.jdt.internal.compiler.tool;resolution:=optional
 Eclipse-BundleShape: dir
+Bundle-ClassPath: java9/java9api.jar,
+ .
diff --git a/org.eclipse.jdt.compiler.apt.tests/build.properties b/org.eclipse.jdt.compiler.apt.tests/build.properties
index bc8963d977..7df12f4db2 100644
--- a/org.eclipse.jdt.compiler.apt.tests/build.properties
+++ b/org.eclipse.jdt.compiler.apt.tests/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2013 BEA Systems Inc. and others
+# Copyright (c) 2006, 2017 BEA Systems Inc. and others
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -20,7 +20,9 @@ bin.includes = about.html,\
                test.xml,\
                META-INF/,\
                resources/,\
+               java9/,\
                lib/,\
                .
 src.includes = about.html
 compilerArg=-proc:none
+jars.extra.classpath = java9/java9api.jar
diff --git a/org.eclipse.jdt.compiler.apt.tests/java9/java9api.jar b/org.eclipse.jdt.compiler.apt.tests/java9/java9api.jar
new file mode 100644
index 0000000000..fd56ad100e
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/java9/java9api.jar
diff --git a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
index bb84956cf9..856d5d047d 100644
--- a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
+++ b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors.jar
diff --git a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors8.jar b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors8.jar
index 64ef0d26d8..e312f51cb8 100644
--- a/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors8.jar
+++ b/org.eclipse.jdt.compiler.apt.tests/lib/apttestprocessors8.jar
diff --git a/org.eclipse.jdt.compiler.apt.tests/pom.xml b/org.eclipse.jdt.compiler.apt.tests/pom.xml
index 8207b4da7b..5f86a1629a 100644
--- a/org.eclipse.jdt.compiler.apt.tests/pom.xml
+++ b/org.eclipse.jdt.compiler.apt.tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2016 Eclipse Foundation and others.
+  Copyright (c) 2012, 2017 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -34,6 +34,10 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
+          <compilerArgs>
+            <args>-endorseddirs</args>
+            <args>${basedir}/lib</args>
+          </compilerArgs>
           <dependency-resolution>
             <!--
               these fragments are assumed to be present during compile and runtime.
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/A.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/A.java
new file mode 100644
index 0000000000..53aac786d8
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/A.java
@@ -0,0 +1,3 @@
+package abc.internal;
+public class A extends TypeInAModule {
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/TypeInAModule.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/TypeInAModule.java
new file mode 100644
index 0000000000..948e3e98f3
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/TypeInAModule.java
@@ -0,0 +1,5 @@
+package abc.internal;
+
+@java.lang.Deprecated()
+public class TypeInAModule {
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/pqr/A.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/pqr/A.java
new file mode 100644
index 0000000000..657fc3cbc9
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/abc/internal/pqr/A.java
@@ -0,0 +1,2 @@
+package abc.internal.pqr;
+public class A {}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/module-info.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/module-info.java
new file mode 100644
index 0000000000..77d0566384
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.a/module-info.java
@@ -0,0 +1,7 @@
+@java.lang.Deprecated()
+module mod.a {
+	exports abc.internal;
+
+	requires transitive java.compiler;
+	requires transitive java.sql;
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/abc/A.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/abc/A.java
new file mode 100644
index 0000000000..a00a9cf09e
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/abc/A.java
@@ -0,0 +1,3 @@
+package abc;
+class A {
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/module-info.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/module-info.java
new file mode 100644
index 0000000000..fcc6ca1420
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/module-info.java
@@ -0,0 +1,6 @@
+@java.lang.Deprecated()
+module mod.b {
+	exports pqr.ext;
+
+	requires mod.a;
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/pqr/ext/B.java b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/pqr/ext/B.java
new file mode 100644
index 0000000000..8f93ceb50c
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/mod_locations/modules/mod.b/pqr/ext/B.java
@@ -0,0 +1,2 @@
+package pqr.ext;
+public class B {}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9/p/A.java b/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9/p/A.java
new file mode 100644
index 0000000000..c23bbb3a67
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9/p/A.java
@@ -0,0 +1,3 @@
+package targets.model9.p;
+public class A {
+}
diff --git a/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9a/internal/GenericType.java b/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9a/internal/GenericType.java
new file mode 100644
index 0000000000..aa1f699ab6
--- /dev/null
+++ b/org.eclipse.jdt.compiler.apt.tests/resources/targets/model9a/internal/GenericType.java
@@ -0,0 +1,7 @@
+package targets.model9a.internal;
+public class GenericType<T> {
+}
+
+enum MyEnum{
+	m1, m2;
+}
\ No newline at end of file