Skip to content

Commit b0550e7

Browse files
brigmtkunkel
authored andcommitted
graalvm: use nashorn compat mode (#551)
(cherry picked from commit 02312a0)
1 parent 01e2f72 commit b0550e7

File tree

6 files changed

+32
-1
lines changed

6 files changed

+32
-1
lines changed

it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java

+16
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,22 @@ public void testGroovyScripts() throws Exception {
7979
proc.assertLog(".*log from script: 123.*");
8080
}
8181

82+
/**
83+
* Js script execution.
84+
*/
85+
@Test
86+
public void testJsScripts() throws Exception {
87+
Payload payload = new Payload()
88+
.archive(resource("scriptJs"))
89+
.arg("arg", "12345")
90+
.arg("pattern", ".234.");
91+
92+
ConcordProcess proc = concord.processes().start(payload);
93+
expectStatus(proc, ProcessEntry.StatusEnum.FINISHED);
94+
95+
proc.assertLog(".*matches: true.*");
96+
}
97+
8298
/**
8399
* Test the process metadata.
84100
*/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
configuration:
2+
runtime: concord-v2
3+
4+
flows:
5+
default:
6+
- script: js
7+
body: |
8+
print("matches: " + arg.matches(pattern));

runtime/v1/impl/pom.xml

+3
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@
242242
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
243243
<resource>META-INF/sisu/javax.inject.Named</resource>
244244
</transformer>
245+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
246+
<resource>META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider</resource>
247+
</transformer>
245248
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
246249
<mainClass>com.walmartlabs.concord.runner.Main</mainClass>
247250
</transformer>

runtime/v2/runner/pom.xml

+3
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@
290290
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
291291
<resource>META-INF/sisu/javax.inject.Named</resource>
292292
</transformer>
293+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
294+
<resource>META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider</resource>
295+
</transformer>
293296
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
294297
<mainClass>com.walmartlabs.concord.runtime.v2.runner.Main</mainClass>
295298
</transformer>

runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/script/DefaultScriptEvaluator.java

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ private ScriptEngine getEngine(String language) {
125125
ScriptEngine engine = GraalJSScriptEngine.create(Engine.newBuilder()
126126
.allowExperimentalOptions(true)
127127
.option("engine.WarnInterpreterOnly", "false")
128+
.option("js.nashorn-compat", "true")
128129
.build(),
129130
org.graalvm.polyglot.Context.newBuilder("js")
130131
.allowHostAccess(access));

targetplatform/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<aopalliance.version>1.0</aopalliance.version>
2121
<aws.version>1.11.475</aws.version>
2222
<bouncycastle.version>1.67</bouncycastle.version>
23-
<bpm.version>1.0.0</bpm.version>
23+
<bpm.version>1.0.1</bpm.version>
2424
<commons.beanutils.version>1.9.4</commons.beanutils.version>
2525
<commons.collections.version>3.2.2</commons.collections.version>
2626
<commons.compress.version>1.21</commons.compress.version>

0 commit comments

Comments
 (0)