Skip to content

Commit d5e3fe3

Browse files
authored
[OpenIdentityPlatform/OpenAM#980] Resolve duplicate dependencies (#172)
* replace nashorn scripting engine with rhino * move cassandra dependencies to parent pom * build on pushing features/* and issues/* branches * fix tests * Use servicemix rhino bundle for OpenIDM * fix tests * Update copyright year for 3A Systems LLC
1 parent 18a8929 commit d5e3fe3

5 files changed

Lines changed: 34 additions & 10 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build Maven
22

33
on:
44
push:
5-
branches: [ 'sustaining/2.4.x','master' ]
5+
branches: [ 'sustaining/2.4.x','master', 'issues/**', 'features/**' ]
66
pull_request:
77
jobs:
88
build-maven:

cassandra-embedded/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
15-
* Copyright 2019-2025 3A Systems LLC.
15+
* Copyright 2019-2026 3A Systems LLC.
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
@@ -61,14 +61,12 @@
6161
</properties>
6262
<dependencies>
6363
<dependency>
64-
<groupId>com.datastax.oss</groupId>
64+
<groupId>org.apache.cassandra</groupId>
6565
<artifactId>java-driver-core</artifactId>
66-
<version>4.17.0</version>
6766
</dependency>
6867
<dependency>
6968
<groupId>org.apache.cassandra</groupId>
7069
<artifactId>cassandra-all</artifactId>
71-
<version>5.0.6</version>
7270
<exclusions>
7371
<exclusion>
7472
<groupId>org.lz4</groupId>

commons/util/util/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
~ information: "Portions copyright [year] [name of copyright owner]".
1313
~
1414
~ Copyright 2015 ForgeRock AS.
15-
~ Portions copyright 2025 3A Systems LLC.
15+
~ Portions copyright 2025-2026 3A Systems LLC.
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
@@ -35,9 +35,9 @@
3535
<artifactId>slf4j-api</artifactId>
3636
</dependency>
3737
<dependency>
38-
<groupId>org.openjdk.nashorn</groupId>
39-
<artifactId>nashorn-core</artifactId>
40-
<version>15.4</version>
38+
<groupId>org.apache.servicemix.bundles</groupId>
39+
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
40+
<version>${rhino.servicemix.version}</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.assertj</groupId>

commons/util/util/src/test/java/org/forgerock/json/JsonPatchJavascriptValueTransformer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@
1212
* information: "Portions Copyrighted [year] [name of copyright owner]".
1313
*
1414
* Copyright 2015-2016 ForgeRock AS.
15+
* Portions Copyrighted 2020-2026 3A Systems LLC.
1516
*/
1617

1718
package org.forgerock.json;
1819

20+
import org.mozilla.javascript.engine.RhinoScriptEngineFactory;
21+
1922
import javax.script.ScriptEngine;
2023
import javax.script.ScriptEngineManager;
2124

@@ -73,7 +76,7 @@ public static ScriptEngine getJSScriptEngine() {
7376
if (Double.parseDouble(System.getProperty("java.specification.version")) < 15) {
7477
return new ScriptEngineManager(null).getEngineByName("js");
7578
} else {
76-
return new ScriptEngineManager().getEngineByName("js");
79+
return new RhinoScriptEngineFactory().getScriptEngine();
7780
}
7881
}
7982
}

pom.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@
210210
<jetty.version>11.0.25</jetty.version>
211211
<grizzly-framework.version>3.0.1</grizzly-framework.version>
212212
<servlet-api.version>5.0.0</servlet-api.version>
213+
<cassandra.version>4.19.2</cassandra.version>
214+
<cassandra-all.version>5.0.6</cassandra-all.version>
213215
</properties>
214216

215217
<prerequisites>
@@ -918,6 +920,27 @@
918920
<groupId>org.glassfish.grizzly</groupId>
919921
<artifactId>grizzly-websockets</artifactId>
920922
<version>${grizzly-framework.version}</version>
923+
</dependency>
924+
<dependency>
925+
<groupId>org.apache.cassandra</groupId>
926+
<artifactId>java-driver-core</artifactId>
927+
<version>${cassandra.version}</version>
928+
</dependency>
929+
<dependency>
930+
<groupId>org.apache.cassandra</groupId>
931+
<artifactId>java-driver-query-builder</artifactId>
932+
<version>${cassandra.version}</version>
933+
</dependency>
934+
<dependency>
935+
<groupId>org.apache.cassandra</groupId>
936+
<artifactId>cassandra-all</artifactId>
937+
<version>${cassandra-all.version}</version>
938+
<exclusions>
939+
<exclusion>
940+
<groupId>org.lz4</groupId>
941+
<artifactId>lz4-java</artifactId>
942+
</exclusion>
943+
</exclusions>
921944
</dependency>
922945
</dependencies>
923946
</dependencyManagement>

0 commit comments

Comments
 (0)