Skip to content

Commit 23c68ee

Browse files
maximthomasmaximthomas
authored
Rhino: migrate from servicemix to org.mozilla (#189)
1 parent 44a00c2 commit 23c68ee

8 files changed

Lines changed: 86 additions & 18 deletions

File tree

‎openidm-repo-orientdb/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,12 @@
248248
<artifactId>mockito-all</artifactId>
249249
<scope>test</scope>
250250
</dependency>
251+
<dependency>
252+
<groupId>org.graalvm.sdk</groupId>
253+
<artifactId>graal-sdk</artifactId>
254+
<version>22.3.0</version>
255+
<scope>test</scope>
256+
</dependency>
251257
</dependencies>
252258
<build>
253259
<plugins>

‎openidm-rhino/pom.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
* The contents of this file are subject to the terms of the Common Development and
4+
* Distribution License (the License). You may not use this file except in compliance with the
5+
* License.
6+
*
7+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
8+
* specific language governing permission and limitations under the License.
9+
*
10+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
11+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
12+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
13+
* information: "Portions copyright [year] [name of copyright owner]".
14+
*
15+
* Copyright 2026 3A Systems LLC.
16+
-->
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.openidentityplatform.openidm</groupId>
23+
<artifactId>openidm-project</artifactId>
24+
<version>7.0.3-SNAPSHOT</version>
25+
</parent>
26+
27+
<artifactId>openidm-rhino</artifactId>
28+
<packaging>bundle</packaging>
29+
<name>${project.groupId}.${project.artifactId}</name>
30+
<description>OSGi bundle wrapper for Mozilla Rhino JavaScript engine</description>
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.mozilla</groupId>
34+
<artifactId>rhino</artifactId>
35+
<scope>provided</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.mozilla</groupId>
39+
<artifactId>rhino-engine</artifactId>
40+
<scope>provided</scope>
41+
</dependency>
42+
</dependencies>
43+
<build>
44+
<plugins>
45+
<plugin>
46+
<groupId>org.apache.felix</groupId>
47+
<artifactId>maven-bundle-plugin</artifactId>
48+
<extensions>true</extensions>
49+
<configuration>
50+
<instructions>
51+
<Bundle-Name>${project.name}</Bundle-Name>
52+
<Bundle-SymbolicName>${project.name}</Bundle-SymbolicName>
53+
<Embed-Dependency>*;groupId=org.mozilla;inline=true;scope=provided</Embed-Dependency>
54+
<Export-Package>*</Export-Package>
55+
<Import-Package>
56+
javax.lang.model;resolution:=optional,
57+
javax.script;resolution:=optional,
58+
*
59+
</Import-Package>
60+
<DynamicImport-Package>*</DynamicImport-Package>
61+
<_removeheaders>
62+
Bnd-LastModified,Built-By,Private-Package,Tool,Build-Jdk,Include-Resource,Ignore-Package,Bundle-DocURL
63+
</_removeheaders>
64+
</instructions>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
70+
</project>

‎openidm-ui/openidm-ui-admin/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,6 @@
187187
<type>css</type>
188188
</dependency>
189189

190-
<dependency>
191-
<groupId>org.apache.servicemix.bundles</groupId>
192-
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
193-
</dependency>
194-
195190
<dependency>
196191
<groupId>org.openidentityplatform.commons.ui.libs</groupId>
197192
<artifactId>less</artifactId>

‎openidm-ui/openidm-ui-enduser/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@
139139
<type>js</type>
140140
</dependency>
141141

142-
<dependency>
143-
<groupId>org.apache.servicemix.bundles</groupId>
144-
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
145-
</dependency>
146-
147142
<dependency>
148143
<groupId>org.openidentityplatform.commons.ui.libs</groupId>
149144
<artifactId>less</artifactId>

‎openidm-util/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@
8888
<artifactId>joda-time</artifactId>
8989
</dependency>
9090
<dependency>
91-
<groupId>org.apache.servicemix.bundles</groupId>
92-
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
91+
<groupId>org.openidentityplatform.openidm</groupId>
92+
<artifactId>openidm-rhino</artifactId>
93+
<version>${project.version}</version>
9394
</dependency>
9495

9596
<!-- Provided OSGi Dependencies -->

‎openidm-zip/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
<artifactId>openidm-script</artifactId>
100100
<version>${project.version}</version>
101101
</dependency>
102+
<dependency>
103+
<groupId>org.openidentityplatform.openidm</groupId>
104+
<artifactId>openidm-rhino</artifactId>
105+
<version>${project.version}</version>
106+
</dependency>
102107
<dependency>
103108
<groupId>org.openidentityplatform.openidm</groupId>
104109
<artifactId>openidm-api-servlet</artifactId>

‎openidm-zip/src/main/assembly/zip.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,7 @@
12181218
<exclude>jakarta.activation*</exclude>
12191219
<exclude>org.bouncycastle:bc*-fips</exclude>
12201220
<exclude>org.openjdk.nashorn:*</exclude>
1221+
<exclude>org.mozilla:rhino*</exclude>
12211222
<exclude>org.apache.felix:org.apache.felix.utils</exclude>
12221223
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
12231224
</excludes>

‎pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
<asm.version>9.9.1</asm.version>
130130
<!-- quartz 2.x is not compatible yet -->
131131
<quartz.version>1.8.6_1</quartz.version>
132-
<rhino.version>1.7.14_2</rhino.version>
133132
<groovy.version>2.4.21</groovy.version>
134133

135134
<!-- OSGi/Felix versions -->
@@ -235,6 +234,7 @@
235234
<!--module>openidm-workflow-remote</module-->
236235
<module>openidm-zip</module>
237236
<module>custom-scripted-connector-bundler</module>
237+
<module>openidm-rhino</module>
238238
</modules>
239239

240240
<profiles>
@@ -593,11 +593,6 @@
593593
<artifactId>org.apache.servicemix.bundles.quartz</artifactId>
594594
<version>${quartz.version}</version>
595595
</dependency>
596-
<dependency>
597-
<groupId>org.apache.servicemix.bundles</groupId>
598-
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
599-
<version>${rhino.version}</version>
600-
</dependency>
601596
<dependency>
602597
<groupId>org.apache.servicemix.bundles</groupId>
603598
<artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>

0 commit comments

Comments
 (0)