Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/012eba66 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/012eba66 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/012eba66 Branch: refs/heads/TINKERPOP-1447 Commit: 012eba661fcc5b4bbd27751417e8e51ebdbddcf3 Parents: 8005cb3 42ce7a5 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Apr 25 06:54:24 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Apr 25 06:54:24 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++++++++++++++++ .../jsr223/GremlinGroovyScriptEngineTest.java | 11 +++++++++ pom.xml | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java ---------------------------------------------------------------------- diff --cc gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java index d481cbb,54e997f..3e1d153 --- 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 @@@ -22,6 -22,12 +22,9 @@@ import groovy.lang.Closure import groovy.lang.MissingPropertyException; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider; -import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider; -import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider; + import org.apache.tinkerpop.gremlin.structure.Vertex; + import org.apache.tinkerpop.gremlin.util.function.Lambda; + import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; import org.javatuples.Pair; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/pom.xml ----------------------------------------------------------------------