Merge branch 'TINKERPOP-1968' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a0947b7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a0947b7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a0947b7 Branch: refs/heads/tp33 Commit: 1a0947b72e0415c26133fdb0a232b2e23ffa572c Parents: 4d0d481 2886eaf Author: Stephen Mallette <[email protected]> Authored: Fri Jun 1 06:17:33 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Jun 1 06:17:33 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 3 + data/tinkerpop-sink-typed.json | 6 +- data/tinkerpop-sink-v2d0-typed.json | 6 +- data/tinkerpop-sink-v2d0.json | 6 +- data/tinkerpop-sink.json | 6 +- data/tinkerpop-sink.kryo | Bin 234 -> 240 bytes .../the-gremlin-console/index.asciidoc | 5 +- .../upgrade/release-3.2.x-incubating.asciidoc | 8 + .../Gherkin/GherkinTestRunner.cs | 3 +- .../Gherkin/IgnoreException.cs | 6 +- .../ModernGraphTypeInformation.cs | 3 +- gremlin-dotnet/test/pom.xml | 2 +- .../traversal/step/map/GroovySelectTest.groovy | 80 +++++- .../traversal/step/map/GroovyVertexTest.groovy | 8 +- gremlin-javascript/pom.xml | 2 +- .../test/cucumber/feature-steps.js | 3 +- .../test/integration/remote-connection-tests.js | 2 +- .../test/integration/traversal-test.js | 2 +- gremlin-python/pom.xml | 2 +- .../src/main/jython/radish/feature_steps.py | 4 +- .../src/main/jython/tests/conftest.py | 6 +- .../src/main/jython/tests/driver/test_client.py | 14 +- .../driver/test_driver_remote_connection.py | 4 +- .../test_driver_remote_connection_threaded.py | 4 +- gremlin-server/scripts/generate-all.groovy | 63 ----- gremlin-server/src/assembly/standalone.xml | 3 - .../driver/remote/RemoteGraphProvider.java | 2 +- .../server/GremlinResultSetIntegrateTest.java | 34 ++- .../server/GremlinServerHttpIntegrateTest.java | 18 +- .../gremlin/server/ServerTestHelper.java | 7 +- .../server/util/DefaultGraphManagerTest.java | 32 ++- .../remote/gremlin-server-integration.yaml | 56 ----- .../server/gremlin-server-integration.yaml | 11 +- .../src/test/scripts/generate-all.groovy | 31 ++- .../src/test/scripts/neo4j-empty.properties | 33 +++ gremlin-test/features/map/AddVertex.feature | 16 +- gremlin-test/features/map/Match.feature | 134 ++++++++++ gremlin-test/features/map/Order.feature | 173 +++++++++++++ gremlin-test/features/map/Properties.feature | 30 ++- gremlin-test/features/map/Select.feature | 151 ++++++++++++ gremlin-test/features/map/Vertex.feature | 45 +++- gremlin-test/features/sideEffect/Group.feature | 1 - gremlin-test/features/sideEffect/Sack.feature | 24 +- .../process/traversal/step/map/SelectTest.java | 245 ++++++++++++++++--- .../process/traversal/step/map/VertexTest.java | 27 +- .../io/graphson/tinkerpop-sink-typed.json | 6 +- .../io/graphson/tinkerpop-sink-v2d0-typed.json | 6 +- .../io/graphson/tinkerpop-sink-v2d0.json | 6 +- .../structure/io/graphson/tinkerpop-sink.json | 6 +- .../structure/io/gryo/tinkerpop-sink.kryo | Bin 234 -> 240 bytes .../gremlin/process/FeatureCoverageTest.java | 44 +--- tinkergraph-gremlin/pom.xml | 19 ++ .../tinkergraph/structure/TinkerFactory.java | 64 ++++- .../tinkergraph/structure/grateful-dead.kryo | Bin 0 -> 332226 bytes 54 files changed, 1126 insertions(+), 346 deletions(-) ----------------------------------------------------------------------
