diff --git a/README.md b/README.md index e296620891e..b56a67864ea 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ The Python (jython) language plugin allows to have `python` as the language of s In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-lang-python/2.0.0`. * For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-lang-python/tree/master). +* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-lang-python/tree/es-1.2). * For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-lang-python/tree/es-1.1). * For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-lang-python/tree/es-1.0). * For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-lang-python/tree/es-0.90). diff --git a/pom.xml b/pom.xml index f49cfecaf4f..8f2882e4a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.0.0-SNAPSHOT - 4.7.0 + 4.8.1 1 true onerror @@ -115,8 +115,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java b/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java index 2a94949830d..14d22fdecb9 100644 --- a/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java +++ b/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java @@ -62,6 +62,11 @@ public class PythonScriptEngineService extends AbstractComponent implements Scri return new String[]{"py"}; } + @Override + public boolean sandboxed() { + return false; + } + @Override public Object compile(String script) { return interp.compile(script); diff --git a/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java b/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java index 0af0505eeca..0cd49cd21fe 100644 --- a/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java +++ b/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java @@ -20,7 +20,6 @@ package org.elasticsearch.script.python; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.common.util.concurrent.jsr166y.ThreadLocalRandom; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; @@ -30,6 +29,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import static org.hamcrest.Matchers.equalTo;