Mercurial > hg > jdk9-shenandoah

changeset 1634:497c34cc0dc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dsamersoff
date Mon, 31 Aug 2015 21:43:28 +0300
parents f7c5ae2933c0 (diff) 0b0a6b9ed991 (current diff)
children da355bc6d1f9
files
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Aug 21 13:34:07 2015 +0200
+++ b/.hgtags	Mon Aug 31 21:43:28 2015 +0300
@@ -320,3 +320,5 @@
 8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
 d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
 7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77
+8c40d4143ee13bdf8170c68cc384c36ab1e9fadb jdk9-b78
+ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79
--- a/make/Images.gmk	Fri Aug 21 13:34:07 2015 +0200
+++ b/make/Images.gmk	Mon Aug 31 21:43:28 2015 +0300
@@ -39,14 +39,14 @@
 
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
-               jdk.accessibility
+               jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
                jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
                jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
--- a/modules.xml	Fri Aug 21 13:34:07 2015 +0200
+++ b/modules.xml	Mon Aug 31 21:43:28 2015 +0300
@@ -1652,6 +1652,10 @@
       <name>jdk.internal.jline.console.history</name>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
+    <export>
+      <name>jdk.internal.jline.internal</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
   </module>
   <module>
     <name>jdk.jartool</name>
@@ -1818,7 +1822,9 @@
     <name>jdk.scripting.nashorn.shell</name>
     <depend>java.base</depend>
     <depend>jdk.scripting.nashorn</depend>
-    <depend>jdk.internal.le</depend>
+    <depend>jdk.internal.le</depend> <!-- jline -->
+    <depend>java.desktop</depend> <!-- EditPad -->
+    <depend>java.compiler</depend> <!-- java package completion -->
   </module>
   <module>
     <name>jdk.sctp</name>