Mercurial > hg > jdk9-shenandoah
changeset 1621:f7c5ae2933c0 jdk9-b80
Merge
author | lana |
---|---|
date | Thu, 27 Aug 2015 13:21:37 -0700 |
parents | 9c2b8cb19844 (current diff) 8d59a6070b98 (diff) |
children | ce60e158dbb0 c356ee0434a0 497c34cc0dc7 909bcc7a8852 |
files | |
diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Images.gmk Thu Aug 27 12:59:49 2015 -0700 +++ b/make/Images.gmk Thu Aug 27 13:21:37 2015 -0700 @@ -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 Thu Aug 27 12:59:49 2015 -0700 +++ b/modules.xml Thu Aug 27 13:21:37 2015 -0700 @@ -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>