diff --git a/openam-core/pom.xml b/openam-core/pom.xml
index 5d118a684f..d6bf80a856 100755
--- a/openam-core/pom.xml
+++ b/openam-core/pom.xml
@@ -448,6 +448,7 @@
         <dependency>
             <groupId>org.openidentityplatform.commons.guice</groupId>
             <artifactId>test</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openidentityplatform.openam</groupId>
diff --git a/openam-http/pom.xml b/openam-http/pom.xml
index 88cd3ec04a..99c727d815 100755
--- a/openam-http/pom.xml
+++ b/openam-http/pom.xml
@@ -64,6 +64,7 @@
         <dependency>
             <groupId>org.openidentityplatform.commons.guice</groupId>
             <artifactId>test</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openidentityplatform.commons</groupId>
diff --git a/openam-notifications-websocket/pom.xml b/openam-notifications-websocket/pom.xml
index 7515bb4873..7c5bf95b50 100644
--- a/openam-notifications-websocket/pom.xml
+++ b/openam-notifications-websocket/pom.xml
@@ -50,6 +50,7 @@
         <dependency>
             <groupId>org.openidentityplatform.commons</groupId>
             <artifactId>test-utils</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/openam-rest/pom.xml b/openam-rest/pom.xml
index 77d2eb06cd..96d83d3230 100755
--- a/openam-rest/pom.xml
+++ b/openam-rest/pom.xml
@@ -145,6 +145,7 @@
         <dependency>
             <groupId>org.openidentityplatform.commons.guice</groupId>
             <artifactId>test</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openidentityplatform.commons</groupId>
diff --git a/openam-restlet/pom.xml b/openam-restlet/pom.xml
index a7faf42080..03b9e39440 100755
--- a/openam-restlet/pom.xml
+++ b/openam-restlet/pom.xml
@@ -72,27 +72,22 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-smile</artifactId>
-            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-cbor</artifactId>
-            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.17.0</version>
         </dependency>
 
 
diff --git a/openam-scripting/pom.xml b/openam-scripting/pom.xml
index 4922450f92..c251a5dce5 100644
--- a/openam-scripting/pom.xml
+++ b/openam-scripting/pom.xml
@@ -13,7 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
- * Portions Copyrighted 2017-2025 3A Systems, LLC
+ * Portions Copyrighted 2017-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>
@@ -72,8 +72,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
         </dependency>
 
         <dependency>
diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml
index 3466627f28..bf84056e79 100644
--- a/openam-ui/openam-ui-ria/pom.xml
+++ b/openam-ui/openam-ui-ria/pom.xml
@@ -13,6 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2017-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>
@@ -39,10 +40,6 @@
             <type>zip</type>
             <classifier>www</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.openidentityplatform.commons.ui.libs</groupId>
             <artifactId>selectize-non-standalone</artifactId>
diff --git a/pom.xml b/pom.xml
index 37aac1cba0..9ba7ca937e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
     <mockito.version>2.23.4</mockito.version>
     <jersey-oauth.version>1.1.5.2</jersey-oauth.version>
     <relaxngDatatype.version>20020414</relaxngDatatype.version>
-    <rhino.version>1.7.14.1</rhino.version>
+    <rhino.version>1.7.15_1</rhino.version>
     <saaj-api.version>2.0.1</saaj-api.version>
     <saaj-impl.version>2.0.1</saaj-impl.version>
     <jsp-api.version>3.0.0</jsp-api.version>
@@ -1061,8 +1061,8 @@
 
       <!-- Mozilla Rhino Javascript engine -->
       <dependency>
-        <groupId>org.mozilla</groupId>
-        <artifactId>rhino</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
         <version>${rhino.version}</version>
       </dependency>
       <!-- Groovy scripting support -->