Skip to content

Commit 8cca5b5

Browse files
Change JavaScript engine to Mozilla rhino (#203)
* Refs #25517. Change JavaScript engine to Mozilla Rhino. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #25517. Fix dependencies in pom.xml so it matches the ones in build.gradle. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 225198d commit 8cca5b5

3 files changed

Lines changed: 7 additions & 15 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repositories {
3232

3333
dependencies {
3434
antlr('org.antlr:antlr4:4.13.2')
35-
implementation group: 'org.openjdk.nashorn', name: 'nashorn-core', version:'15.4'
35+
implementation group: 'org.mozilla', name: 'rhino-engine', version:'1.7.14'
3636
}
3737

3838
generateGrammarSource {

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<plugin>
1414
<groupId>org.antlr</groupId>
1515
<artifactId>antlr4-maven-plugin</artifactId>
16-
<version>4.5</version>
16+
<version>4.13.2</version>
1717
<configuration>
1818
<sourceDirectory>src/main/antlr</sourceDirectory>
1919
<arguments>
@@ -78,12 +78,12 @@
7878
<dependency>
7979
<groupId>org.antlr</groupId>
8080
<artifactId>antlr4</artifactId>
81-
<version>4.5</version>
81+
<version>4.13.2</version>
8282
</dependency>
8383
<dependency>
84-
<groupId>org.antlr</groupId>
85-
<artifactId>stringtemplate</artifactId>
86-
<version>3.2</version>
84+
<groupId>org.mozilla</groupId>
85+
<artifactId>rhino-engine</artifactId>
86+
<version>1.7.14</version>
8787
</dependency>
8888
</dependencies>
8989
<properties>

src/main/java/com/eprosima/idl/context/Context.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,15 +1439,7 @@ public String concatStringLiterals(
14391439

14401440
public static ScriptEngine getJSScriptEngine()
14411441
{
1442-
if (Double.parseDouble(System.getProperty("java.specification.version")) < 11)
1443-
{
1444-
return new ScriptEngineManager().getEngineByName("js");
1445-
}
1446-
else
1447-
{
1448-
return new org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory()
1449-
.getScriptEngine();
1450-
}
1442+
return new ScriptEngineManager().getEngineByName("JavaScript");
14511443
}
14521444

14531445
public String evaluate_literal(

0 commit comments

Comments
 (0)