Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1917:734b3209b6ed jdk-9+175
8182416: Clean up module-info.java like move requires transitive adjacent to exports
Reviewed-by: alanb
author | mchung |
---|---|
date | Sat, 17 Jun 2017 11:50:42 -0700 |
parents | da6134f74952 |
children | 3c6fbdf6e785 |
files | src/jdk.scripting.nashorn.shell/share/classes/module-info.java src/jdk.scripting.nashorn/share/classes/module-info.java |
diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn.shell/share/classes/module-info.java Thu Jun 15 17:24:14 2017 +0000 +++ b/src/jdk.scripting.nashorn.shell/share/classes/module-info.java Sat Jun 17 11:50:42 2017 -0700 @@ -38,9 +38,9 @@ * @since 9 */ module jdk.scripting.nashorn.shell { + requires java.compiler; requires java.desktop; - requires java.compiler; + requires jdk.internal.le; requires jdk.scripting.nashorn; - requires jdk.internal.le; }
--- a/src/jdk.scripting.nashorn/share/classes/module-info.java Thu Jun 15 17:24:14 2017 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/module-info.java Sat Jun 17 11:50:42 2017 -0700 @@ -142,8 +142,9 @@ */ module jdk.scripting.nashorn { requires java.logging; + requires jdk.dynalink; + requires transitive java.scripting; - requires jdk.dynalink; exports jdk.nashorn.api.scripting; exports jdk.nashorn.api.tree; @@ -155,9 +156,9 @@ exports jdk.nashorn.tools to jdk.scripting.nashorn.shell; - provides javax.script.ScriptEngineFactory - with jdk.nashorn.api.scripting.NashornScriptEngineFactory; + provides javax.script.ScriptEngineFactory with + jdk.nashorn.api.scripting.NashornScriptEngineFactory; - provides jdk.dynalink.linker.GuardingDynamicLinkerExporter - with jdk.nashorn.api.linker.NashornLinkerExporter; + provides jdk.dynalink.linker.GuardingDynamicLinkerExporter with + jdk.nashorn.api.linker.NashornLinkerExporter; }