From f5a4efc17159691632cae2bb7412a6a6108ed8ad Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 7 Jul 2015 13:17:52 +0200
Subject: [PATCH 1/2] 8080679: Include jline in JDK for Java and JavaScript
 REPLs

Reviewed-by: alanb, erikj, forax, iris, sundar
---
 make/CompileJavaModules.gmk |  4 ++++
 make/Images.gmk             |  2 +-
 modules.xml                 | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index af91a283696..ea48c7f40f1 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -368,6 +368,10 @@ jdk.compiler_CLEAN_FILES := $(wildcard \
 
 ################################################################################
 
+jdk.internal.le_COPY := .properties
+
+################################################################################
+
 jdk.jcmd_COPY := _options
 
 ################################################################################
diff --git a/make/Images.gmk b/make/Images.gmk
index 80147ccf9d9..0dfba0f509e 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -46,7 +46,7 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \
                jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
                jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
diff --git a/modules.xml b/modules.xml
index 355f56a4270..78c9ae561ae 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1624,6 +1624,26 @@
       <name>com.sun.net.httpserver.spi</name>
     </export>
   </module>
+  <module>
+    <name>jdk.internal.le</name>
+    <depend>java.base</depend>
+    <export>
+      <name>jdk.internal.jline</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console.completer</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+    <export>
+      <name>jdk.internal.jline.console.history</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
+  </module>
   <module>
     <name>jdk.jartool</name>
     <depend>java.base</depend>

From c265539479cf31001acd8633d6db2c025b1ccc9c Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 9 Jul 2015 13:49:31 -0700
Subject: [PATCH 2/2] Added tag jdk9-b72 for changeset 7dd7a38425a8

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index e6f4871454e..aace44e73fd 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -314,3 +314,4 @@ f546760134eb861fcfecd4ce611b0040b0d25a6a jdk9-b67
 1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69
 eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
 c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
+8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72