From 19aa1e4a623dabca873e294699afe4b9db786e57 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 6 Apr 2026 18:07:15 +0300 Subject: [PATCH 1/7] replace nashorn scripting engine with rhino --- commons/util/util/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml index dbac7510f..77608baf7 100644 --- a/commons/util/util/pom.xml +++ b/commons/util/util/pom.xml @@ -12,7 +12,7 @@ ~ information: "Portions copyright [year] [name of copyright owner]". ~ ~ Copyright 2015 ForgeRock AS. - ~ Portions copyright 2025 3A Systems LLC. + ~ Portions copyright 2025-2026 3A Systems LLC. --> 4.0.0 @@ -35,9 +35,9 @@ slf4j-api - org.openjdk.nashorn - nashorn-core - 15.4 + org.mozilla + rhino + 1.7.14.1 org.assertj From cc0c3081115859d63a96c8cd02067aa8be7192cb Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 6 Apr 2026 18:07:58 +0300 Subject: [PATCH 2/7] move cassandra dependencies to parent pom --- cassandra-embedded/pom.xml | 6 ++---- pom.xml | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cassandra-embedded/pom.xml b/cassandra-embedded/pom.xml index 2838ec598..668722cdd 100644 --- a/cassandra-embedded/pom.xml +++ b/cassandra-embedded/pom.xml @@ -12,7 +12,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2019-2025 3A Systems LLC. + * Copyright 2019-2026 3A Systems LLC. --> 4.0.0 @@ -61,14 +61,12 @@ - com.datastax.oss + org.apache.cassandra java-driver-core - 4.17.0 org.apache.cassandra cassandra-all - 5.0.6 org.lz4 diff --git a/pom.xml b/pom.xml index ececd2c74..500c2922b 100644 --- a/pom.xml +++ b/pom.xml @@ -210,6 +210,8 @@ 11.0.25 3.0.1 5.0.0 + 4.19.2 + 5.0.6 @@ -918,6 +920,27 @@ org.glassfish.grizzly grizzly-websockets ${grizzly-framework.version} + + + org.apache.cassandra + java-driver-core + ${cassandra.version} + + + org.apache.cassandra + java-driver-query-builder + ${cassandra.version} + + + org.apache.cassandra + cassandra-all + ${cassandra-all.version} + + + org.lz4 + lz4-java + + From b68a3b0605a9d073a7edb9ae3d5480ec510a3891 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 6 Apr 2026 18:14:29 +0300 Subject: [PATCH 3/7] build on pushing features/* and issues/* branches --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 627b40c04..ab6b9b8ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build Maven on: push: - branches: [ 'sustaining/2.4.x','master' ] + branches: [ 'sustaining/2.4.x','master', 'issues/**', 'features/**' ] pull_request: jobs: build-maven: From c5b42919681a5f5ada575e7fcbffdb6735ba2103 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 6 Apr 2026 18:37:31 +0300 Subject: [PATCH 4/7] fix tests --- commons/util/util/pom.xml | 5 +++++ .../forgerock/json/JsonPatchJavascriptValueTransformer.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml index 77608baf7..3d77b4845 100644 --- a/commons/util/util/pom.xml +++ b/commons/util/util/pom.xml @@ -39,6 +39,11 @@ rhino 1.7.14.1 + + org.mozilla + rhino-engine + 1.7.14.1 + org.assertj assertj-core diff --git a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java index b91fbc2eb..ed22f669c 100644 --- a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java +++ b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java @@ -12,6 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2020 3A Systems LLC. */ package org.forgerock.json; @@ -73,7 +74,7 @@ public static ScriptEngine getJSScriptEngine() { if (Double.parseDouble(System.getProperty("java.specification.version")) < 15) { return new ScriptEngineManager(null).getEngineByName("js"); } else { - return new ScriptEngineManager().getEngineByName("js"); + return new ScriptEngineManager().getEngineByName("rhino"); } } } From acab75454333bfd8c4d16ea95a97bbe1ab093428 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 7 Apr 2026 14:20:28 +0300 Subject: [PATCH 5/7] Use servicemix rhino bundle for OpenIDM --- commons/util/util/pom.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/commons/util/util/pom.xml b/commons/util/util/pom.xml index 3d77b4845..f20ecd44a 100644 --- a/commons/util/util/pom.xml +++ b/commons/util/util/pom.xml @@ -35,14 +35,9 @@ slf4j-api - org.mozilla - rhino - 1.7.14.1 - - - org.mozilla - rhino-engine - 1.7.14.1 + org.apache.servicemix.bundles + org.apache.servicemix.bundles.rhino + ${rhino.servicemix.version} org.assertj From 159107e2e2bcf7cdd2e0d0e7cf3c81d1960bda01 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 7 Apr 2026 15:19:46 +0300 Subject: [PATCH 6/7] fix tests --- .../forgerock/json/JsonPatchJavascriptValueTransformer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java index ed22f669c..1523bebe3 100644 --- a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java +++ b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java @@ -17,6 +17,8 @@ package org.forgerock.json; +import org.mozilla.javascript.engine.RhinoScriptEngineFactory; + import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; @@ -74,7 +76,7 @@ public static ScriptEngine getJSScriptEngine() { if (Double.parseDouble(System.getProperty("java.specification.version")) < 15) { return new ScriptEngineManager(null).getEngineByName("js"); } else { - return new ScriptEngineManager().getEngineByName("rhino"); + return new RhinoScriptEngineFactory().getScriptEngine(); } } } From c97d04afd048a4f7db4289162bb5708b272677b0 Mon Sep 17 00:00:00 2001 From: Maxim Thomas Date: Wed, 8 Apr 2026 07:33:50 +0300 Subject: [PATCH 7/7] Update copyright year for 3A Systems LLC --- .../org/forgerock/json/JsonPatchJavascriptValueTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java index 1523bebe3..cd2d52b36 100644 --- a/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java +++ b/commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java @@ -12,7 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions Copyrighted 2020 3A Systems LLC. + * Portions Copyrighted 2020-2026 3A Systems LLC. */ package org.forgerock.json;