diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml
index 6f3b433ce..e921c5304 100644
--- a/commons/util/util/pom.xml
+++ b/commons/util/util/pom.xml
@@ -35,9 +35,12 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-            <version>${rhino.servicemix.version}</version>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/pom.xml b/pom.xml
index 2e3cc1a32..7b8e96133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,6 @@
         <slf4j.version>2.0.17</slf4j.version>
         <swagger.version>1.6.11</swagger.version>
         <rhino.version>1.7.15.1</rhino.version>
-        <rhino.servicemix.version>1.7.15_1</rhino.servicemix.version>
         <jetty.version>11.0.25</jetty.version>
         <grizzly-framework.version>3.0.1</grizzly-framework.version>
         <servlet-api.version>5.0.0</servlet-api.version>
@@ -627,6 +626,16 @@
                 <artifactId>common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mozilla</groupId>
+                <artifactId>rhino</artifactId>
+                <version>${rhino.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mozilla</groupId>
+                <artifactId>rhino-engine</artifactId>
+                <version>${rhino.version}</version>
+            </dependency>
             <dependency>
 		        <groupId>org.asciidoctor</groupId>
 		        <artifactId>asciidoctorj</artifactId>
diff --git a/script/javascript/pom.xml b/script/javascript/pom.xml
index 80c92e456..d3533edc8 100644
--- a/script/javascript/pom.xml
+++ b/script/javascript/pom.xml
@@ -65,9 +65,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-            <version>${rhino.servicemix.version}</version>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
         </dependency>
         <!--
         <dependency>