changeset 2194:26582f7254cc

Merge
author alanb
date Mon, 26 Jun 2017 07:50:57 +0100
parents a5994d2b9cff 3c6fbdf6e785
children e93bc38cf3f3
files .hgtags src/jdk.scripting.nashorn.shell/share/classes/module-info.java src/jdk.scripting.nashorn/share/classes/module-info.java
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 15 18:55:22 2017 +0100
+++ b/.hgtags	Mon Jun 26 07:50:57 2017 +0100
@@ -411,3 +411,4 @@
 c8d6b740f0f7ec834b4157bf0d4523e8bbddb3f0 jdk-9+172
 fa8e4de50e821eed876388c84f7129a6739268be jdk-9+173
 7d4006eaa088848c4fa2ac4aef0ba9982f80752a jdk-9+174
+734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175
--- a/src/jdk.scripting.nashorn.shell/share/classes/module-info.java	Thu Jun 15 18:55:22 2017 +0100
+++ b/src/jdk.scripting.nashorn.shell/share/classes/module-info.java	Mon Jun 26 07:50:57 2017 +0100
@@ -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 18:55:22 2017 +0100
+++ b/src/jdk.scripting.nashorn/share/classes/module-info.java	Mon Jun 26 07:50:57 2017 +0100
@@ -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;
 }