You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/10/16 12:09:31 UTC
[tinkerpop] 01/01: TINKERPOP-2066 Bump to Groovy 2.5.3
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2066
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 759d1a724eef3f76b48508ba8c49dcb992eff28f
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Oct 16 08:09:00 2018 -0400
TINKERPOP-2066 Bump to Groovy 2.5.3
---
gremlin-console/src/main/static/NOTICE | 2 +-
.../apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 +++---
gremlin-server/src/main/static/NOTICE | 2 +-
.../apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index c989c58..c1c6487 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.5.2 (AL ASF)
+Apache Groovy 2.5.3 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index e26d0d6..a9a8077 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -311,9 +311,9 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
// presented itself where the "Method code too large!" comes with other compilation errors so
// it seems that this message trumps other compilation errors to some reasonable degree that ends
// up being favorable for this problem
- if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method code too large!") &&
+ if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method too large") &&
((MultipleCompilationErrorsException) t).getErrorCollector().getErrorCount() == 1) {
- final String errorMessage = String.format("The Gremlin statement that was submitted exceed the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
+ final String errorMessage = String.format("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
logger.warn(errorMessage);
rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
.statusMessage(errorMessage)
@@ -332,7 +332,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
}
/**
- * Used to decrease the size of a Gremlin script that triggered a "method code too large" exception so that it
+ * Used to decrease the size of a Gremlin script that triggered a "method too large" exception so that it
* doesn't log a massive text string nor return a large error message.
*/
private RequestMessage trimMessage(final RequestMessage msg) {
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index 4fc9c71..0f48edb 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.5.2 (AL ASF)
+Apache Groovy 2.5.3 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 2126f7a..daba83f 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -1394,7 +1394,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
client.submit(script, b).all().get();
fail("Should have tanked out because of number of parameters used and size of the compile script");
} catch (Exception ex) {
- assertThat(ex.getMessage(), containsString("The Gremlin statement that was submitted exceed the maximum compilation size allowed by the JVM"));
+ assertThat(ex.getMessage(), containsString("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM"));
}
}
}
diff --git a/pom.xml b/pom.xml
index cd51535..3c642f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,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.5.2</groovy.version>
+ <groovy.version>2.5.3</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>