From 1e96e00e77a508f8ecc130df91ff5b5eff5d36c8 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Sun, 14 Jun 2026 16:16:13 +0300
Subject: [PATCH 1/2] Remove optional Rhino dependency from pom.xml

Removed optional dependency on Apache ServiceMix bundles Rhino.
---
 .../connector-framework-internal/pom.xml                  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OpenICF-java-framework/connector-framework-internal/pom.xml b/OpenICF-java-framework/connector-framework-internal/pom.xml
index 202cb0b4..0c84346c 100644
--- a/OpenICF-java-framework/connector-framework-internal/pom.xml
+++ b/OpenICF-java-framework/connector-framework-internal/pom.xml
@@ -63,21 +63,17 @@
         </dependency>
 
         <!--Optional dependencies-->
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-            <version>1.7.15_1</version>
-            <optional>true</optional>
-        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easytesting</groupId>
             <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>

From ab68cccf4874aa3b9cb90d6d5f34907fe3aa8a3e Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Sun, 14 Jun 2026 16:22:44 +0300
Subject: [PATCH 2/2] Add optional dependencies for Rhino and Rhino Engine

---
 .../connector-framework-internal/pom.xml              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenICF-java-framework/connector-framework-internal/pom.xml b/OpenICF-java-framework/connector-framework-internal/pom.xml
index 0c84346c..b05bd56a 100644
--- a/OpenICF-java-framework/connector-framework-internal/pom.xml
+++ b/OpenICF-java-framework/connector-framework-internal/pom.xml
@@ -63,7 +63,16 @@
         </dependency>
 
         <!--Optional dependencies-->
-
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.testng</groupId>