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 2020/05/21 22:58:53 UTC
[tinkerpop] branch TINKERPOP-2373 created (now cc3c5cb)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2373
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
at cc3c5cb Bump to Groovy 3.0
This branch includes the following new commits:
new cc3c5cb Bump to Groovy 3.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tinkerpop] 01/01: Bump to Groovy 3.0
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2373
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit cc3c5cb83e253b9949076628a7cfaade7f86f40e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu May 21 18:58:28 2020 -0400
Bump to Groovy 3.0
---
CHANGELOG.asciidoc | 3 ++-
gremlin-groovy/pom.xml | 14 ++++++++++++++
.../jsr223/ast/InterpreterModeASTTransformation.groovy | 2 +-
.../groovy/jsr223/GremlinGroovyScriptEngineTest.java | 2 +-
.../groovy/util/DependencyGrabberIntegrateTest.java | 2 +-
.../gremlin/server/GremlinServerIntegrateTest.java | 2 +-
pom.xml | 4 ++--
7 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f1cb66b..8aae8f3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -47,7 +47,8 @@ This release also includes changes from <<release-3-4-3, 3.4.3>>.
* Configured GraphBinary as the default binary serialization format for the Java Driver.
* Configured GraphSON 3.0 as the default text serialization format when no serializer can be determined.
* Configured GraphSON 3.0 as the default setting for the `GraphSONMapper`.
-* Bump to Neo4j 3.4.11.
+* Bumped to Neo4j 3.4.11.
+* Bumped to Groovy 3.0.3.
* Added a parameterized `TypeTranslator` for use with `GroovyTranslator` that should produce more cache hits.
* Added support for `TextP` in Neo4j using its string search functions.
* Changed `TraversalStrategy` application methodology to apply each strategy in turn to each level of the traversal hierarchy starting from root down to children.
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index bbae2b5..7bad521 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -57,6 +57,20 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-cli-picocli</artifactId>
+ <version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <!--
+ not sure why jline won't come in with groovy-groovysh but it messes up build of gremlin-console
+ -->
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>2.14.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy.version}</version>
<classifier>indy</classifier>
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/InterpreterModeASTTransformation.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/InterpreterModeASTTransformation.groovy
index e7a3c62..f6e1b88 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/InterpreterModeASTTransformation.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/InterpreterModeASTTransformation.groovy
@@ -61,7 +61,7 @@ class InterpreterModeASTTransformation implements ASTTransformation {
ClassNode scriptNode = (ClassNode) astNodes[1]
// need to check that object is a Script to call run(). this scriptNode may be a user defined class via
- // "def class" in which case it can be ignored as there are no variables to promote to global status there
+ // "class" in which case it can be ignored as there are no variables to promote to global status there
if (scriptNode.isDerivedFrom(ClassHelper.make(Script))) {
def runMethodOfScript = scriptNode.declaredMethodsMap["java.lang.Object run()"]
runMethodOfScript.code = wrap(runMethodOfScript)
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index d40dc19..57909ae 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -103,7 +103,7 @@ public class GremlinGroovyScriptEngineTest {
public void shouldPromoteDefinedVarsInInterpreterModeWithNoBindings() throws Exception {
final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine(new InterpreterModeGroovyCustomizer());
engine.eval("def addItUp = { x, y -> x + y }");
- engine.eval("def class A { def sub(int x, int y) {x - y}}");
+ engine.eval("class A { def sub(int x, int y) {x - y}}");
assertEquals(3, engine.eval("int xxx = 1 + 2"));
assertEquals(4, engine.eval("yyy = xxx + 1"));
assertEquals(7, engine.eval("def zzz = yyy + xxx"));
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
index 7441d22..a0d5549 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabberIntegrateTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.fail;
*/
public class DependencyGrabberIntegrateTest {
private static final String GROUP_ID = "org.apache.tinkerpop";
- private static final String VERSION = "3.3.8";
+ private static final String VERSION = "3.3.9";
private static final GroovyClassLoader groovyClassLoader = new GroovyClassLoader();
private static final File extTestDir = TestHelper.makeTestDataPath(DependencyGrabberIntegrateTest.class);
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 10a4433..6e9f166 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
@@ -772,7 +772,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
- client.submit("def class C { def C getC(){return this}}; new C()").all().join();
+ client.submit("class C { def C getC(){return this}}; new C()").all().join();
fail("Should throw an exception.");
} catch (RuntimeException re) {
final Throwable root = ExceptionUtils.getRootCause(re);
diff --git a/pom.xml b/pom.xml
index 0670cde..3ee044b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@ limitations under the License.
<commons.configuration.version>2.6</commons.configuration.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.8.1</commons.lang3.version>
- <groovy.version>2.5.11</groovy.version>
+ <groovy.version>3.0.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>
@@ -446,7 +446,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>