# HG changeset patch
# User amurillo
# Date 1439835498 25200
# Node ID 0a877885e84993fbf286f8c79d306722d9868633
# Parent  db66a419590add1de56ab6433823247ec982f90f# Parent  d731e40878a7a6a47b9a06d072e21931027f12c0
Merge

diff -r db66a419590a -r 0a877885e849 modules.xml
--- a/modules.xml	Thu Aug 13 15:50:47 2015 -0700
+++ b/modules.xml	Mon Aug 17 11:18:18 2015 -0700
@@ -1794,7 +1794,7 @@
     <name>jdk.scripting.nashorn</name>
     <depend>java.base</depend>
     <depend>java.logging</depend>
-    <depend>java.scripting</depend>
+    <depend re-exports="true">java.scripting</depend>
     <export>
       <name>jdk.nashorn.internal.runtime</name>
       <to>jdk.scripting.nashorn.shell</to>
@@ -1807,6 +1807,12 @@
       <name>jdk.nashorn.tools</name>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
+    <export>
+      <name>jdk.nashorn.api.scripting</name>
+    </export>
+    <export>
+      <name>jdk.nashorn.api.tree</name>
+    </export>
   </module>
   <module>
     <name>jdk.scripting.nashorn.shell</name>