From 23547103c860020f286985ac7cd12b34f757a68d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 08:36:44 +0000
Subject: [PATCH 1/2] Bump rhino from 1.7.10 to 1.7.12

Bumps [rhino](https://github.com/mozilla/rhino) from 1.7.10 to 1.7.12.
- [Release notes](https://github.com/mozilla/rhino/releases)
- [Changelog](https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/mozilla/rhino/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 main/pom.xml   | 2 +-
 server/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index e974eab77..ccaa47363 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>
-      <version>1.7.10</version>
+      <version>1.7.12</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 3a76bfe4d..c3d7eab6e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -180,7 +180,7 @@
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>
-      <version>1.7.10</version>
+      <version>1.7.12</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

From 8ac6c4b8894555581ae6cce5611573d9bf5d60f2 Mon Sep 17 00:00:00 2001
From: Tom Morris <tfmorris@gmail.com>
Date: Wed, 10 Jun 2020 20:43:01 -0400
Subject: [PATCH 2/2] Switch to new rhino-runtime component

---
 main/pom.xml   | 3 +--
 server/pom.xml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index ccaa47363..6e2b3765b 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -172,7 +172,7 @@
     </dependency>
     <dependency>
       <groupId>org.mozilla</groupId>
-      <artifactId>rhino</artifactId>
+      <artifactId>rhino-runtime</artifactId>
       <version>1.7.12</version>
     </dependency>
     <dependency>
@@ -380,4 +380,3 @@
      </dependency> 
   </dependencies>
 </project>
-
diff --git a/server/pom.xml b/server/pom.xml
index c3d7eab6e..690605418 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -179,7 +179,7 @@
     </dependency>
     <dependency>
       <groupId>org.mozilla</groupId>
-      <artifactId>rhino</artifactId>
+      <artifactId>rhino-runtime</artifactId>
       <version>1.7.12</version>
     </dependency>
     <dependency>
@@ -194,4 +194,3 @@
     </dependency>
   </dependencies>
 </project>
-