Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: [ 'sustaining/1.8.x','master' ]
branches: [ 'sustaining/1.8.x','master', 'issues/**', 'features/**' ]
pull_request:
jobs:
build-maven:
Expand Down
26 changes: 10 additions & 16 deletions OpenICF-java-framework/connector-framework-internal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"

Portions Copyrighted 2024-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 @@ -36,22 +38,6 @@
The IdentityConnectors framework provides a container to separate the Connector bundle from the application.
The framework provides many common features that developers would otherwise need to implement on their own.
</description>
<profiles>
<profile>
<id>jdk17.options</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
Expand All @@ -76,6 +62,14 @@
<!-- @see: org/identityconnectors/framework/impl/test/TestHelpersImpl.java -->
</dependency>

<!--Optional dependencies-->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.rhino</artifactId>
<version>1.7.15_1</version>
<optional>true</optional>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.testng</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
* with the fields enclosed by brackets [] replaced by
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
* Portions Copyrighted 2024-2026 3A Systems LLC.
*/

package org.identityconnectors.common.script.javascript;
Expand Down Expand Up @@ -55,6 +57,10 @@ public class JavaScriptExecutorFactory extends ScriptExecutorFactory {
*/
public JavaScriptExecutorFactory() {
ScriptEngine engine = manager.getEngineByName(JAVA_SCRIPT);
if(engine == null) {
manager.registerEngineName(JAVA_SCRIPT, new org.mozilla.javascript.engine.RhinoScriptEngineFactory());
engine = manager.getEngineByName(JAVA_SCRIPT);
}
if (null == engine) {
throw new IllegalStateException("JavaScript Engine is not found");
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
<version>5.0.4</version>
<version>5.1.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down