Skip to content

[OpenIdentityPlatform/OpenAM#980] Resolve duplicate dependencies #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maximthomas merged 7 commits into from
Apr 8, 2026
Merged

[OpenIdentityPlatform/OpenAM#980] Resolve duplicate dependencies #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19aa1e4
replace nashorn scripting engine with rhino
maximthomas Apr 6, 2026
cc0c308
move cassandra dependencies to parent pom
maximthomas Apr 6, 2026
b68a3b0
build on pushing features/* and issues/* branches
maximthomas Apr 6, 2026
c5b4291
fix tests
maximthomas Apr 6, 2026
acab754
Use servicemix rhino bundle for OpenIDM
maximthomas Apr 7, 2026
159107e
fix tests
maximthomas Apr 7, 2026
c97d04a
Update copyright year for 3A Systems LLC
maximthomas Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 2 additions & 4 deletions cassandra-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<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>
Expand Down Expand Up @@ -61,14 +61,12 @@
</properties>
<dependencies>
<dependency>
<groupId>com.datastax.oss</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
<version>4.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>5.0.6</version>
<exclusions>
<exclusion>
<groupId>org.lz4</groupId>
Expand Down
8 changes: 4 additions & 4 deletions commons/util/util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -35,9 +35,9 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
<version>${rhino.servicemix.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand Down
5 changes: 4 additions & 1 deletion commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
* information: "Portions Copyrighted [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
* Portions Copyrighted 2020-2026 3A Systems LLC.
*/

package org.forgerock.json;

import org.mozilla.javascript.engine.RhinoScriptEngineFactory;

import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;

Expand Down Expand Up @@ -73,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("js");
return new RhinoScriptEngineFactory().getScriptEngine();
}
}
}
Expand Down
23 changes: 23 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@
<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>
<cassandra.version>4.19.2</cassandra.version>
<cassandra-all.version>5.0.6</cassandra-all.version>
</properties>

<prerequisites>
Expand Down Expand Up @@ -918,6 +920,27 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-websockets</artifactId>
<version>${grizzly-framework.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
<version>${cassandra.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-query-builder</artifactId>
<version>${cassandra.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>${cassandra-all.version}</version>
<exclusions>
<exclusion>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Loading