Merge pull request #12288 from martijnvg/upgrade_groovy

upgrade groovy from 2.4.0 to 2.4.4
2015-07-16 14:40:06 +02:00 · 2015-07-16 14:40:06 +02:00 · 211b4d9083
parent 2399741f87 9687670e8d
commit 211b4d9083
4 changed files with 3 additions and 3 deletions
--- a/core/licenses/groovy-all-2.4.0-indy.jar.sha1
+++ b/core/licenses/groovy-all-2.4.0-indy.jar.sha1
@ -1 +0,0 @@
-b8056886c1067b096c5ef05a024f1c5e9008e293
--- a/core/licenses/groovy-all-2.4.4-indy.jar.sha1
+++ b/core/licenses/groovy-all-2.4.4-indy.jar.sha1
@ -0,0 +1 @@
+574a15e35eba5f986a0564ae197c78e843ece954
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
@ -535,7 +535,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
                .addAggregation(terms("terms")
                        .field(MULTI_VALUED_FIELD_NAME)
                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .script(new Script("(long) _value / 1000 + 1")))
+                                .script(new Script("(long) (_value / 1000 + 1)")))
                .execute().actionGet();

        assertSearchResponse(response);
--- a/pom.xml
+++ b/pom.xml
@ -409,7 +409,7 @@
            <dependency>
                <groupId>org.codehaus.groovy</groupId>
                <artifactId>groovy-all</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.4</version>
                <classifier>indy</classifier>
            </dependency>