changeset 2158:b3ea15f8d67d jpms-pr2

Merge
author alanb
date Fri, 07 Apr 2017 11:17:39 +0100
parents 8ce75a7ba115 e36e62d3ea53
children ee4c180e7758
files src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java src/jdk.scripting.nashorn/share/classes/module-info.java
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.dynalink/share/classes/module-info.java	Thu Apr 06 18:55:20 2017 +0100
+++ b/src/jdk.dynalink/share/classes/module-info.java	Fri Apr 07 11:17:39 2017 +0100
@@ -217,6 +217,7 @@
  * from B will get a chance to link the call site in A when it encounters the
  * object from B.
  *
+ * @moduleGraph
  * @since 9
  */
 module jdk.dynalink {
--- a/src/jdk.scripting.nashorn/share/classes/module-info.java	Thu Apr 06 18:55:20 2017 +0100
+++ b/src/jdk.scripting.nashorn/share/classes/module-info.java	Fri Apr 07 11:17:39 2017 +0100
@@ -90,6 +90,7 @@
 In addition to {@code Java}, Nashorn also exposes some other non-standard built-in objects:
 {@code JSAdapter}, {@code JavaImporter}, {@code Packages}
 
+@moduleGraph
 @since 9
  */
 module jdk.scripting.nashorn {