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/11/27 14:36:32 UTC
[tinkerpop] branch master updated (8ea559e -> 8aa3c9d)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 8ea559e Fixed build problems after inclusion of powermock from merge from 3.4-dev
add a6ebe54 TINKERPOP-2479 Adds config/reset options to :bytecode command
add 563ac97 Merge branch 'TINKERPOP-2479' into 3.4-dev
new 8aa3c9d Merge branch '3.4-dev'
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.
Summary of changes:
CHANGELOG.asciidoc | 3 +
docs/src/reference/gremlin-applications.asciidoc | 19 ++++++
docs/src/upgrade/release-3.4.x.asciidoc | 10 ++++
.../console/commands/BytecodeCommand.groovy | 70 ++++++++++++++++++++--
.../console/commands/BytecodeCommand.properties | 2 +-
.../ser/AbstractGraphSONMessageSerializerV2d0.java | 1 -
6 files changed, 99 insertions(+), 6 deletions(-)
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8aa3c9deb754a93f86aee9299445017fd114cb1b
Merge: 8ea559e 563ac97
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Nov 27 09:16:34 2020 -0500
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 3 +
docs/src/reference/gremlin-applications.asciidoc | 19 ++++++
docs/src/upgrade/release-3.4.x.asciidoc | 10 ++++
.../console/commands/BytecodeCommand.groovy | 70 ++++++++++++++++++++--
.../console/commands/BytecodeCommand.properties | 2 +-
.../ser/AbstractGraphSONMessageSerializerV2d0.java | 1 -
6 files changed, 99 insertions(+), 6 deletions(-)
diff --cc gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
index 93e28eb,3718202..0d739fc
--- 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
@@@ -22,11 -22,15 +22,14 @@@ import org.apache.tinkerpop.gremlin.con
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator
+ import org.apache.tinkerpop.gremlin.structure.io.IoRegistry
-import org.apache.tinkerpop.gremlin.structure.io.Mapper
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper
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.