From 92b0bb79125fcb6605cef7e318fa66c5f55c28b3 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Mon, 8 Jun 2026 14:25:59 +0300
Subject: [PATCH 1/2] Bundle org.mozilla.rhino to OSGI bundle

---
 commons/util/util/pom.xml |  5 ++-
 pom.xml                   |  6 +++-
 script/javascript/pom.xml |  5 ++-
 script/pom.xml            |  1 +
 script/rhino/pom.xml      | 70 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 script/rhino/pom.xml

diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml
index 6f3b433ce..7d4cb0ea5 100644
--- a/commons/util/util/pom.xml
+++ b/commons/util/util/pom.xml
@@ -35,9 +35,8 @@
             <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.openidentityplatform.commons.script</groupId>
+            <artifactId>rhino</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/pom.xml b/pom.xml
index 2e3cc1a32..262d0475f 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,11 @@
                 <artifactId>common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.openidentityplatform.commons.script</groupId>
+                <artifactId>rhino</artifactId>
+                <version>${project.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..2660cbf07 100644
--- a/script/javascript/pom.xml
+++ b/script/javascript/pom.xml
@@ -65,9 +65,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-            <version>${rhino.servicemix.version}</version>
+            <groupId>org.openidentityplatform.commons.script</groupId>
+            <artifactId>rhino</artifactId>
         </dependency>
         <!--
         <dependency>
diff --git a/script/pom.xml b/script/pom.xml
index 450b01c53..cbf4c3c69 100644
--- a/script/pom.xml
+++ b/script/pom.xml
@@ -65,6 +65,7 @@
         <module>common</module>
         <module>javascript</module>
         <module>groovy</module>
+        <module>rhino</module>
     </modules>
 
     <dependencyManagement>
diff --git a/script/rhino/pom.xml b/script/rhino/pom.xml
new file mode 100644
index 000000000..54f4ad761
--- /dev/null
+++ b/script/rhino/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2026 3A Systems LLC.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.openidentityplatform.commons</groupId>
+        <artifactId>script</artifactId>
+        <version>3.1.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.openidentityplatform.commons.script</groupId>
+    <artifactId>rhino</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.groupId}.${project.artifactId}</name>
+    <description>OSGi bundle wrapper for Mozilla Rhino JavaScript engine</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
+            <version>${rhino.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
+            <version>${rhino.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.name}</Bundle-SymbolicName>
+                        <Embed-Dependency>*;groupId=org.mozilla;inline=true</Embed-Dependency>
+                        <Export-Package>*</Export-Package>
+                        <Import-Package>
+                            javax.lang.model;resolution:=optional,
+                            javax.script;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <_removeheaders>
+                            Bnd-LastModified,Built-By,Private-Package,Tool,Build-Jdk,Include-Resource,Ignore-Package,Bundle-DocURL
+                        </_removeheaders>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

From 5d7c92d743d988715f344726f96b2384f7d1c151 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 9 Jun 2026 09:22:57 +0300
Subject: [PATCH 2/2] Rhino: migrate from servicemix to mozilla

---
 commons/util/util/pom.xml |  6 +++-
 pom.xml                   |  9 +++--
 script/javascript/pom.xml |  6 +++-
 script/pom.xml            |  1 -
 script/rhino/pom.xml      | 70 ---------------------------------------
 5 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 script/rhino/pom.xml

diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml
index 7d4cb0ea5..e921c5304 100644
--- a/commons/util/util/pom.xml
+++ b/commons/util/util/pom.xml
@@ -35,9 +35,13 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openidentityplatform.commons.script</groupId>
+            <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 262d0475f..7b8e96133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,9 +627,14 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openidentityplatform.commons.script</groupId>
+                <groupId>org.mozilla</groupId>
                 <artifactId>rhino</artifactId>
-                <version>${project.version}</version>
+                <version>${rhino.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mozilla</groupId>
+                <artifactId>rhino-engine</artifactId>
+                <version>${rhino.version}</version>
             </dependency>
             <dependency>
 		        <groupId>org.asciidoctor</groupId>
diff --git a/script/javascript/pom.xml b/script/javascript/pom.xml
index 2660cbf07..d3533edc8 100644
--- a/script/javascript/pom.xml
+++ b/script/javascript/pom.xml
@@ -65,9 +65,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.openidentityplatform.commons.script</groupId>
+            <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
+        </dependency>
         <!--
         <dependency>
             <groupId>org.eclipse.wst.jsdt.debug</groupId>
diff --git a/script/pom.xml b/script/pom.xml
index cbf4c3c69..450b01c53 100644
--- a/script/pom.xml
+++ b/script/pom.xml
@@ -65,7 +65,6 @@
         <module>common</module>
         <module>javascript</module>
         <module>groovy</module>
-        <module>rhino</module>
     </modules>
 
     <dependencyManagement>
diff --git a/script/rhino/pom.xml b/script/rhino/pom.xml
deleted file mode 100644
index 54f4ad761..000000000
--- a/script/rhino/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * The contents of this file are subject to the terms of the Common Development and
- * Distribution License (the License). You may not use this file except in compliance with the
- * License.
- *
- * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
- * specific language governing permission and limitations under the License.
- *
- * When distributing Covered Software, include this CDDL Header Notice in each file and include
- * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
- * Header, with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions copyright [year] [name of copyright owner]".
- *
- * Copyright 2026 3A Systems LLC.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.openidentityplatform.commons</groupId>
-        <artifactId>script</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
-    </parent>
-    <groupId>org.openidentityplatform.commons.script</groupId>
-    <artifactId>rhino</artifactId>
-    <packaging>bundle</packaging>
-    <name>${project.groupId}.${project.artifactId}</name>
-    <description>OSGi bundle wrapper for Mozilla Rhino JavaScript engine</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-            <version>${rhino.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino-engine</artifactId>
-            <version>${rhino.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.name}</Bundle-Name>
-                        <Bundle-SymbolicName>${project.name}</Bundle-SymbolicName>
-                        <Embed-Dependency>*;groupId=org.mozilla;inline=true</Embed-Dependency>
-                        <Export-Package>*</Export-Package>
-                        <Import-Package>
-                            javax.lang.model;resolution:=optional,
-                            javax.script;resolution:=optional,
-                            *
-                        </Import-Package>
-                        <_removeheaders>
-                            Bnd-LastModified,Built-By,Private-Package,Tool,Build-Jdk,Include-Resource,Ignore-Package,Bundle-DocURL
-                        </_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file