--- a/nashorn/make/project.properties	Tue Mar 15 13:48:31 2016 -0700
+++ b/nashorn/make/project.properties	Thu Mar 17 19:04:35 2016 +0000
@@ -31,8 +31,8 @@
 
 # source and target levels
 build.compiler=modern
-javac.source=1.8
-javac.target=1.8
+javac.source=1.9
+javac.target=1.9
 
 javadoc.option=-tag "implSpec:a:Implementation Requirements:"
 
@@ -53,6 +53,12 @@
 # nasgen tool
 nasgen.tool=jdk.nashorn.internal.tools.nasgen.Main
 
+nasgen.module.imports=\
+
+nasgen.module.imports=\
+    java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED,\
+    java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED
+
 # parallel test runner tool
 parallel.test.runner=jdk.nashorn.internal.test.framework.ParallelTestRunner
 
@@ -70,15 +76,11 @@
 
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/nashorn.jar
+dynalink.jar=${dist.dir}/dynalink.jar
+nashorn.jar=${dist.dir}/nashorn.jar
+jjs.jar=${dist.dir}/jjs.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 
-# nashorn javafx shell
-fxshell.tool = jdk.nashorn.tools.FXShell
-fxshell.classes.dir = ${build.dir}/fxshell/classes
-fxshell.dir = tools/fxshell
-fxshell.jar = ${dist.dir}/nashornfx.jar
-
 # configuration for java flight recorder
 run.test.jvmargs.jfr=-XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,disk=true,dumponexit=true,dumponexitpath=${build.dir},stackdepth=128
 
@@ -121,16 +123,28 @@
 
 javac.debug=true
 javac.encoding=ascii
-javac.classpath=\
-    ${build.classes.dir}
 javac.test.classpath=\
-    ${build.classes.dir}${path.separator}\
     ${build.test.classes.dir}${path.separator}\
     ${file.reference.testng.jar}${path.separator}\
     ${file.reference.jcommander.jar}${path.separator}\
     ${file.reference.bsh.jar}${path.separator}\
     ${file.reference.snakeyaml.jar}
 
+test.module.imports=\
+    jdk.scripting.nashorn/jdk.nashorn.internal.ir=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.codegen=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.parser=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.objects=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.doubleconv=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.linker=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.events=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.options=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.internal.runtime.regexp.joni=ALL-UNNAMED,\
+    jdk.scripting.nashorn/jdk.nashorn.tools=ALL-UNNAMED,\
+    java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED
+
 meta.inf.dir=${nashorn.module.src.dir}/META-INF
 
 run.classpath=\
@@ -298,8 +312,11 @@
     ${nashorn.api.tests.jar}
 
 dynalink.module.src.dir=src/jdk.dynalink/share/classes
+dynalink.module.classes.dir=${build.classes.dir}/jdk.dynalink
 nashorn.module.src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.module.classes.dir=${build.classes.dir}/jdk.scripting.nashorn
 nashorn.shell.module.src.dir=src/jdk.scripting.nashorn.shell/share/classes
+nashorn.shell.module.classes.dir=${build.classes.dir}/jdk.scripting.nashorn.shell
 
 src.dir=${dynalink.module.src.dir}${path.separator}\
         ${nashorn.module.src.dir}${path.separator}\
@@ -324,6 +341,8 @@
 
 run.test.jvmargs.common=\
   -server \
+  -XaddExports:${test.module.imports} \
+  -Xpatch:${build.classes.dir} \
   -Dfile.encoding=UTF-8 \
   -Duser.language=${run.test.user.language} \
   -Duser.country=${run.test.user.country} \