From 0eb29e351bb436d0d3ffd492fef6f86a2835979f Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 2 Jul 2018 11:44:42 +0200
Subject: [PATCH] IDEA-192088 use nashorn sandbox

---
 .idea/libraries/delight_nashorn_sandbox.xml          | 10 ++++++++++
 .idea/libraries/delight_rhino_sandbox.xml            | 12 ------------
 .idea/libraries/rhino.xml                            | 12 ------------
 .../intellij/build/CommunityLibraryLicenses.groovy   |  8 +++-----
 platform/platform-api/intellij.platform.ide.iml      |  3 +--
 5 files changed, 14 insertions(+), 31 deletions(-)
 create mode 100644 .idea/libraries/delight_nashorn_sandbox.xml
 delete mode 100644 .idea/libraries/delight_rhino_sandbox.xml
 delete mode 100644 .idea/libraries/rhino.xml

diff --git a/.idea/libraries/delight_nashorn_sandbox.xml b/.idea/libraries/delight_nashorn_sandbox.xml
new file mode 100644
index 000000000000..0bf237883408
--- /dev/null
+++ b/.idea/libraries/delight_nashorn_sandbox.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="delight-nashorn-sandbox" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.javadelight:delight-nashorn-sandbox:0.1.15" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-nashorn-sandbox/0.1.15/delight-nashorn-sandbox-0.1.15.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/delight_rhino_sandbox.xml b/.idea/libraries/delight_rhino_sandbox.xml
deleted file mode 100644
index 9e07dde3714b..000000000000
--- a/.idea/libraries/delight_rhino_sandbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="delight-rhino-sandbox" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.javadelight:delight-rhino-sandbox:0.0.6" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.6/delight-rhino-sandbox-0.0.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/javadelight/delight-rhino-sandbox/0.0.6/delight-rhino-sandbox-0.0.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/rhino.xml b/.idea/libraries/rhino.xml
deleted file mode 100644
index a9bf4e66838a..000000000000
--- a/.idea/libraries/rhino.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="rhino" type="repository">
-    <properties maven-id="org.mozilla:rhino:1.7.10" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.10/rhino-1.7.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mozilla/rhino/1.7.10/rhino-1.7.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index e43df72aef8f..e778f32e1dff 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -325,7 +325,7 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "pockets", attachedTo: "intellij.python.helpers", version: "0.3.2", license: "BSD", url: "http://pockets.readthedocs.org/"),
     new LibraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/",
                        licenseUrl: "https://github.com/google/protobuf/blob/master/LICENSE"),
-    new LibraryLicense(name: "Proxy Vole", libraryName: "proxy-vole", version: "1.0.4", license: "Apache 2.0",
+    new LibraryLicense(name: "Proxy Vole", libraryName: "proxy-vole", version: "1.0.5", license: "Apache 2.0",
                        url: "https://github.com/MarkusBernhardt/proxy-vole", licenseUrl: "https://github.com/MarkusBernhardt/proxy-vole/blob/master/LICENSE.md"),
     new LibraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.7.5", license: "Eclipse Public License v1.0",
                        url: "https://github.com/traff/pty4j"),
@@ -426,10 +426,8 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "JetBrains Annotations for Java 5", libraryName: "jetbrains-annotations-java5", version: "16.0.1", license: "Apache 2.0",
                        url: "https://github.com/JetBrains/java-annotations"),
 
-    new LibraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino", version: "1.7.8", license: "MPL 1.1",
-                       url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html"),
-    new LibraryLicense(name: "delight-rhino-sandbox", libraryName: "delight-rhino-sandbox", version: "0.0.6", license: "Apache 2.0",
-                       url: "https://github.com/javadelight/delight-rhino-sandbox", licenseUrl: "https://github.com/javadelight/delight-rhino-sandbox/blob/master/LICENSE.TXT"),
+    new LibraryLicense(name: "delight-nashorn-sandbox", libraryName: "delight-nashorn-sandbox", version: "0.1.15", license: "Apache 2.0",
+                       url: "https://github.com/javadelight/delight-nashorn-sandbox", licenseUrl: "https://github.com/javadelight/delight-nashorn-sandbox/blob/master/LICENSE.TXT"),
 
     new LibraryLicense(name: "error-prone-annotations", libraryName: "error-prone-annotations", version: "2.3.1", license: "Apache 2.0",
                        url: "https://github.com/google/error-prone", licenseUrl: "https://github.com/google/error-prone/blob/master/COPYING"),
diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml
index 8e849b914abb..fe2d84a93e9d 100644
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -32,7 +32,6 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="delight-rhino-sandbox" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="rhino" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="delight-nashorn-sandbox" level="project" />
   </component>
 </module>
\ No newline at end of file