Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1908 4dad1f3be -> df4d2c515 (forced update)
TINKERPOP-1908 Bump to Groovy 2.4.14 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/df4d2c51 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df4d2c51 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df4d2c51 Branch: refs/heads/TINKERPOP-1908 Commit: df4d2c515a160ff77c262ad66dd02ac5c7e29dd3 Parents: a61dd58 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Mar 2 06:52:09 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Mar 2 09:51:55 2018 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java | 4 ++-- .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java | 4 ++-- .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +- pom.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index a24b1fb..f73e063 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-8]] === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET) +* Bumped to Groovy 2.4.14. * Added `checkAdjacentVertices` option to `SubgraphStrategy`. * Modified `GremlinDslProcessor` so that it generated the `getAnonymousTraversalClass()` method to return the DSL version of `__`. * Added the "Kitchen Sink" test data set. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java index 6f3383e..0007925 100644 --- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java +++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java @@ -48,7 +48,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest { } catch (ScriptException se) { final Throwable root = ExceptionUtils.getRootCause(se); assertEquals(MultipleCompilationErrorsException.class, root.getClass()); - assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is right and if the method exists.")); + assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is correct and if the method exists.")); } } @@ -66,7 +66,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest { } catch (ScriptException se) { final Throwable root = ExceptionUtils.getRootCause(se); assertEquals(MultipleCompilationErrorsException.class, root.getClass()); - assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is right and if the method exists.")); + assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is correct and if the method exists.")); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java index 6c70e8e..a0c6b0c 100644 --- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java +++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java @@ -49,7 +49,7 @@ public class GremlinGroovyScriptEngineTypeCheckedTest { } catch (ScriptException se) { final Throwable root = ExceptionUtils.getRootCause(se); assertEquals(MultipleCompilationErrorsException.class, root.getClass()); - assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is right and if the method exists.")); + assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is correct and if the method exists.")); } } @@ -67,7 +67,7 @@ public class GremlinGroovyScriptEngineTypeCheckedTest { } catch (ScriptException se) { final Throwable root = ExceptionUtils.getRootCause(se); assertEquals(MultipleCompilationErrorsException.class, root.getClass()); - assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is right and if the method exists.")); + assertThat(se.getMessage(), containsString("[Static type checking] - Cannot find matching method java.lang.Object#getRed(). Please check if the declared type is correct and if the method exists.")); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java index baf4c02..df7b734 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java @@ -853,7 +853,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra final JsonNode node = mapper.readTree(json); assertEquals("java.lang.ArithmeticException", node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).get(0).asText()); assertEquals(1, node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).size()); - assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.math.BigDecimal.divide(BigDecimal.java:1742)\n\tat org.codehaus.groovy.runtime.typehandling.BigDecimalMath.divideImpl(BigDecimalMath.java:68)\n\tat org.codehaus.groovy.runtime.typehandling.IntegerMath.divideImpl(IntegerMath.java:49)\n\tat org.codehaus.groovy.runtime.dgmimpl.NumberNumberDiv$NumberNumber.invoke(NumberNumberDiv.java:323)\n\tat org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite.call(PojoMetaMethodSite.java:56)\n\tat org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCall(CallSiteArray.java:48)\n\tat org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:113)\n\tat org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:125)\n")); + assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.math.BigDecimal.divide(BigDecimal.java")); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f6ff536..a83ded5 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ limitations under the License. <commons.configuration.version>1.10</commons.configuration.version> <commons.lang.version>2.6</commons.lang.version> <commons.lang3.version>3.3.1</commons.lang3.version> - <groovy.version>2.4.11</groovy.version> + <groovy.version>2.4.14</groovy.version> <hadoop.version>2.7.2</hadoop.version> <java.tuples.version>1.2</java.tuples.version> <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
