changeset 45670:2b0b8cd704d4

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 440df6a3a92b
children a723cd1d8e26 a4ba08de01fd
files nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java	Thu Jun 15 17:24:14 2017 +0000
+++ b/nashorn/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/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java	Thu Jun 15 17:24:14 2017 +0000
+++ b/nashorn/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;
 }