# HG changeset patch
# User amurillo
# Date 1439835498 25200
# Node ID a52b80d52f19eb363030ef2245a91cd61917c88a
# Parent  5a6a6df6a203f5f510595c3b9713eb3135b3489d# Parent  1dee89d0dcc1fda72bc6b45a9a656db295edb2c9
Merge

diff -r 5a6a6df6a203 -r a52b80d52f19 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>