This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch TINKERPOP-2703 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 40446b311326648a6d695d9b4f7308ba9635c65f Author: Stephen Mallette <[email protected]> AuthorDate: Thu May 21 18:58:28 2020 -0400 TINKERPOP-2373 Bump to Groovy 4.0 --- CHANGELOG.asciidoc | 3 ++- .../org/apache/tinkerpop/gremlin/console/Colorizer.groovy | 2 +- .../org/apache/tinkerpop/gremlin/console/Console.groovy | 8 ++++---- .../tinkerpop/gremlin/console/GremlinGroovysh.groovy | 10 +++++----- .../org/apache/tinkerpop/gremlin/console/PluggedIn.groovy | 3 +-- .../apache/tinkerpop/gremlin/console/Preferences.groovy | 2 +- .../gremlin/console/commands/BytecodeCommand.groovy | 4 ++-- .../tinkerpop/gremlin/console/commands/ClsCommand.groovy | 4 ++-- .../gremlin/console/commands/GremlinSetCommand.groovy | 10 +++++----- .../gremlin/console/commands/InstallCommand.groovy | 4 ++-- .../gremlin/console/commands/PluginCommand.groovy | 4 ++-- .../gremlin/console/commands/RemoteCommand.groovy | 4 ++-- .../gremlin/console/commands/SubmitCommand.groovy | 4 ++-- .../gremlin/console/commands/UninstallCommand.groovy | 4 ++-- .../console/jsr223/DriverRemoteAcceptorIntegrateTest.java | 2 +- .../gremlin/console/jsr223/DriverRemoteAcceptorTest.java | 2 +- .../console/jsr223/GephiRemoteAcceptorIntegrateTest.java | 2 +- .../console/jsr223/MockGroovyGremlinShellEnvironment.java | 2 +- .../gremlin/console/jsr223/UtilitiesGremlinPluginTest.java | 2 +- 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 | 2 +- 25 files changed, 57 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 1c91de9..8da3371 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -52,6 +52,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Removed previously deprecated Gremlin steps that conflicted with Python keywords. * Bumped to Apache Hadoop 3.3.1. * Bumped to Apache Spark 3.2.0. +* Bumped to Apache Groovy 4.0.0. * Bumped node.js in `gremlin-javascript` to v16.13.0. * Changed `NumberHelper` to properly cast to `byte` and `short` rather than default coercing to `Integer`. * Modified some driver defaults (maximum content length, pool size, maximum in process) to be more consistent with one another. @@ -581,7 +582,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Prevented Java driver from sending multiple request messages with the same identifier. * Improved error message for `property(T,Object)` when mutating graph elements. * Added method caching for GraphSON 3.0 deserialization of `P` and `TextP` instances. -* Allowed setting `ssl_options` for gremlin-python. +* Allowed setting `ssl_options` for gremlin-python. * Fixed bug with global `dedup()` when used in reducing `by()` of `group()`. * Fixed bug with Javascript Groovy `Translator` when generating Gremlin with multiple embedded traversals. * Modified Gremlin Server `Settings` to be more extensible allowing for custom options with the YAML parser. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy index 0fee402..f155024 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy @@ -19,7 +19,7 @@ package org.apache.tinkerpop.gremlin.console; -import org.codehaus.groovy.tools.shell.AnsiDetector +import org.apache.groovy.groovysh.AnsiDetector import org.fusesource.jansi.Ansi import org.fusesource.jansi.AnsiConsole diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy index bf5fe0c..306c73c 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy @@ -49,11 +49,11 @@ import org.apache.tinkerpop.gremlin.structure.T import org.apache.tinkerpop.gremlin.structure.Vertex import org.apache.tinkerpop.gremlin.util.Gremlin import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator -import org.codehaus.groovy.tools.shell.ExitNotification -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.ExitNotification +import org.apache.groovy.groovysh.Groovysh import org.codehaus.groovy.tools.shell.IO -import org.codehaus.groovy.tools.shell.InteractiveShellRunner -import org.codehaus.groovy.tools.shell.commands.SetCommand +import org.apache.groovy.groovysh.InteractiveShellRunner +import org.apache.groovy.groovysh.commands.SetCommand import org.fusesource.jansi.Ansi import sun.misc.Signal import sun.misc.SignalHandler diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy index 96015db..b7cfd94 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy @@ -22,12 +22,12 @@ import groovy.transform.ThreadInterrupt import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer -import org.codehaus.groovy.tools.shell.Command -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.Command +import org.apache.groovy.groovysh.Groovysh import org.codehaus.groovy.tools.shell.IO -import org.codehaus.groovy.tools.shell.ParseCode -import org.codehaus.groovy.tools.shell.Parser -import org.codehaus.groovy.tools.shell.util.CommandArgumentParser +import org.apache.groovy.groovysh.ParseCode +import org.apache.groovy.groovysh.Parser +import org.apache.groovy.groovysh.util.CommandArgumentParser /** * Overrides the posix style parsing of Groovysh allowing for commands to parse prior to Groovy 2.4.x. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy index fb87f79..fec8fd8 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy @@ -18,7 +18,6 @@ */ package org.apache.tinkerpop.gremlin.console -import org.apache.tinkerpop.gremlin.console.Preferences; import org.apache.tinkerpop.gremlin.jsr223.BindingsCustomizer import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer @@ -26,7 +25,7 @@ import org.apache.tinkerpop.gremlin.jsr223.ScriptCustomizer import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.Groovysh import org.codehaus.groovy.tools.shell.IO /** diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy index d8c1afe..63ccfd6 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy @@ -22,7 +22,7 @@ package org.apache.tinkerpop.gremlin.console; import java.util.prefs.PreferenceChangeEvent import java.util.prefs.PreferenceChangeListener -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.Groovysh import org.codehaus.groovy.tools.shell.IO public class Preferences { diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy index ca966e5..0d739fc 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy @@ -28,8 +28,8 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule -import org.codehaus.groovy.tools.shell.ComplexCommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.ComplexCommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Commands that help work with Gremlin bytecode. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy index b21e0c4..451d942 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy @@ -19,8 +19,8 @@ package org.apache.tinkerpop.gremlin.console.commands import org.apache.tinkerpop.gremlin.console.Mediator -import org.codehaus.groovy.tools.shell.CommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.CommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Clear the console. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy index f86042d..e071d8e 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy @@ -20,9 +20,9 @@ package org.apache.tinkerpop.gremlin.console.commands import jline.console.completer.Completer -import org.codehaus.groovy.tools.shell.Groovysh -import org.codehaus.groovy.tools.shell.commands.SetCommand -import org.codehaus.groovy.tools.shell.util.PackageHelper +import org.apache.groovy.groovysh.Groovysh +import org.apache.groovy.groovysh.commands.SetCommand +import org.apache.groovy.groovysh.util.PackageHelper import org.codehaus.groovy.tools.shell.util.Preferences import org.codehaus.groovy.tools.shell.util.SimpleCompletor @@ -79,8 +79,8 @@ class GremlinSetCommand extends SetCommand { } return [ - new SimpleCompletor(loader), - null + new SimpleCompletor(loader), + null ] } } diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy index 9736f44..8fa2aaa 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy @@ -25,8 +25,8 @@ import groovy.grape.Grape import org.apache.tinkerpop.gremlin.groovy.util.Artifact import org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin -import org.codehaus.groovy.tools.shell.CommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.CommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Install a dependency into the console. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy index 98cd7cf..2841d7d 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy @@ -20,8 +20,8 @@ package org.apache.tinkerpop.gremlin.console.commands import org.apache.tinkerpop.gremlin.console.ConsoleFs import org.apache.tinkerpop.gremlin.console.Mediator -import org.codehaus.groovy.tools.shell.ComplexCommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.ComplexCommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Activate and manage a plugin. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy index ba98410..7fec0e6 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy @@ -21,8 +21,8 @@ package org.apache.tinkerpop.gremlin.console.commands import org.apache.tinkerpop.gremlin.console.Mediator import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException -import org.codehaus.groovy.tools.shell.ComplexCommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.ComplexCommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Configure a remote connection to a Gremlin Server. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy index 5021458..ec156cb 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy @@ -19,8 +19,8 @@ package org.apache.tinkerpop.gremlin.console.commands import org.apache.tinkerpop.gremlin.console.Mediator -import org.codehaus.groovy.tools.shell.CommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.CommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Submit a script to a Gremlin Server instance. diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy index 285a231..982102a 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy @@ -20,8 +20,8 @@ package org.apache.tinkerpop.gremlin.console.commands import org.apache.tinkerpop.gremlin.console.ConsoleFs import org.apache.tinkerpop.gremlin.console.Mediator -import org.codehaus.groovy.tools.shell.CommandSupport -import org.codehaus.groovy.tools.shell.Groovysh +import org.apache.groovy.groovysh.CommandSupport +import org.apache.groovy.groovysh.Groovysh /** * Uninstall a maven dependency from the Console's path. diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java index 33499d5..cdff527 100644 --- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java @@ -27,7 +27,7 @@ import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException; import org.apache.tinkerpop.gremlin.server.Settings; import org.apache.tinkerpop.gremlin.structure.io.Storage; import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java index a15857a..f36d148 100644 --- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java @@ -21,7 +21,7 @@ package org.apache.tinkerpop.gremlin.console.jsr223; import org.apache.tinkerpop.gremlin.TestHelper; import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException; import org.apache.tinkerpop.gremlin.structure.io.Storage; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java index 9e2a024..4c29b7b 100644 --- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java @@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.console.Mediator; import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.codehaus.groovy.tools.shell.IO; import org.junit.Before; import org.junit.Rule; diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java index e24b77c..e13efb6 100644 --- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java @@ -19,7 +19,7 @@ package org.apache.tinkerpop.gremlin.console.jsr223; import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.codehaus.groovy.tools.shell.IO; /** diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java index 07fd951..40fae1b 100644 --- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java +++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java @@ -21,7 +21,7 @@ package org.apache.tinkerpop.gremlin.console.jsr223; import org.apache.commons.io.input.NullInputStream; import org.apache.tinkerpop.gremlin.console.PluggedIn; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.codehaus.groovy.tools.shell.IO; import org.junit.Test; diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml index 8fed09e..2ea4c51 100644 --- a/gremlin-groovy/pom.xml +++ b/gremlin-groovy/pom.xml @@ -63,6 +63,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 228e36c..361caf2 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 @@ -120,7 +120,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 1210c61..34066d1 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 @@ -869,7 +869,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 3cbac57..578f4d5 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ limitations under the License. <commons.text.version>1.9</commons.text.version> <cucumber.version>6.11.0</cucumber.version> <exp4j.version>0.4.8</exp4j.version> - <groovy.version>2.5.14</groovy.version> + <groovy.version>4.0.0</groovy.version> <guice.version>4.2.3</guice.version> <hadoop.version>3.3.1</hadoop.version> <hamcrest.version>2.2</hamcrest.version>
