Skip to content
Closed
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
5 changes: 5 additions & 0 deletions indexing-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@
<artifactId>commons-collections4</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>${nashorn.version}</version>
</dependency>
<dependency>
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public JavaScriptWorkerSelectStrategy(

private SelectorFunction compileSelectorFunction()
{
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
try {
((Compilable) engine).compile("var apply = " + function).eval();
return ((Invocable) engine).getInterface(SelectorFunction.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,10 @@
import org.hamcrest.CoreMatchers;
import org.joda.time.Period;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

import javax.script.ScriptEngineManager;

public class JavaScriptWorkerSelectStrategyTest
{
@Rule
Expand Down Expand Up @@ -76,13 +72,6 @@ public class JavaScriptWorkerSelectStrategyTest
JavaScriptConfig.getEnabledInstance()
);

@Before
public void checkJdkCompatibility()
{
// skip tests for newer JDKs without javascript support
Assume.assumeNotNull(new ScriptEngineManager().getEngineByName("javascript"));
}

@Test
public void testSerde() throws Exception
{
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<jna.version>5.13.0</jna.version>
<jna-platform.version>5.13.0</jna-platform.version>
<hadoop.compile.version>3.3.6</hadoop.compile.version>
<nashorn.version>15.4</nashorn.version>
<mockito.version>5.14.2</mockito.version>
<aws.sdk.version>1.12.638</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
Expand Down Expand Up @@ -1373,6 +1374,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>${nashorn.version}</version>
</dependency>
<dependency>
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>${nashorn.version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.druid</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public JavaScriptTieredBrokerSelectorStrategy(

private SelectorFunction compileSelectorFunction()
{
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
try {
((Compilable) engine).compile("var apply = " + function).eval();
return ((Invocable) engine).getInterface(SelectorFunction.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,10 @@
import org.apache.druid.query.topn.TopNQueryBuilder;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

import javax.script.ScriptEngineManager;
import java.util.LinkedHashMap;

public class JavaScriptTieredBrokerSelectorStrategyTest
Expand All @@ -51,13 +48,6 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
JavaScriptConfig.getEnabledInstance()
);

@Before
public void checkJdkCompatibility()
{
// skip tests for newer JDKs without javascript support
Assume.assumeNotNull(new ScriptEngineManager().getEngineByName("javascript"));
}

@Test
public void testSerde() throws Exception
{
Expand Down