Skip to content

Commit 10b3c89

Browse files
committed
Update to elasticsearch 1.2.0
Closes #20 Fix #19
1 parent 22465d2 commit 10b3c89

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ JavaScript lang Plugin for Elasticsearch
33

44
The JavaScript language plugin allows to have `javascript` (or `js`) as the language of scripts to execute.
55

6-
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-lang-javascript/2.0.0.RC1`.
6+
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-lang-javascript/2.1.0`.
77

88
* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/master).
9+
* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-1.2).
910
* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-1.1).
1011
* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-1.0).
1112
* For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-0.90).

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<properties>
3535
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
36-
<lucene.version>4.7.0</lucene.version>
36+
<lucene.version>4.8.1</lucene.version>
3737
<tests.jvms>1</tests.jvms>
3838
<tests.shuffle>true</tests.shuffle>
3939
<tests.output>onerror</tests.output>
@@ -117,8 +117,8 @@
117117
<artifactId>maven-compiler-plugin</artifactId>
118118
<version>2.3.2</version>
119119
<configuration>
120-
<source>1.6</source>
121-
<target>1.6</target>
120+
<source>1.7</source>
121+
<target>1.7</target>
122122
</configuration>
123123
</plugin>
124124
<plugin>

src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ public String[] extensions() {
8181
return new String[]{"js"};
8282
}
8383

84+
@Override
85+
public boolean sandboxed() {
86+
return false;
87+
}
88+
8489
@Override
8590
public Object compile(String script) {
8691
Context ctx = Context.enter();

src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.script.javascript;
2121

2222
import org.elasticsearch.common.settings.ImmutableSettings;
23-
import org.elasticsearch.common.util.concurrent.jsr166y.ThreadLocalRandom;
2423
import org.elasticsearch.script.ExecutableScript;
2524
import org.elasticsearch.test.ElasticsearchTestCase;
2625
import org.junit.Test;
@@ -29,6 +28,7 @@
2928
import java.util.Map;
3029
import java.util.concurrent.CountDownLatch;
3130
import java.util.concurrent.CyclicBarrier;
31+
import java.util.concurrent.ThreadLocalRandom;
3232
import java.util.concurrent.atomic.AtomicBoolean;
3333

3434
import static org.hamcrest.Matchers.equalTo;

0 commit comments

Comments
 (0)