8171503: Nashorn build, test failures with the latest jdk9-dev forest - javadoc target and test target fail
Reviewed-by: jlaskey
diff --git a/make/build.xml b/make/build.xml
index cbf7f29..6237191 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -278,7 +278,6 @@
</classpath>
<fileset dir="${dynalink.module.src.dir}" includes="**/*.java"/>
<fileset dir="${nashorn.module.src.dir}" includes="**/*.java"/>
- <fileset dir="${nashorn.shell.module.src.dir}" includes="**/*.java"/>
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
</javadoc>
</target>
diff --git a/make/project.properties b/make/project.properties
index 9b61ea8..da1c640 100644
--- a/make/project.properties
+++ b/make/project.properties
@@ -356,6 +356,7 @@
-server \
${test.module.imports} \
${run.test.jvmargs.external} \
+ --add-modules jdk.scripting.nashorn.shell \
${nashorn.override.option} \
-Dfile.encoding=UTF-8 \
-Duser.language=${run.test.user.language} \
