[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b757173b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b757173b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b757173b Branch: refs/heads/master Commit: b757173b1c036e97d58c2abf7584922c0aa6870f Parents: f9f0112 fc36be1 Author: Florian Hockmann Authored: Sun Jul 22 15:54:14 2018 +0200 Committer: Florian Hockmann Committed: Sun Jul 22 15:54:14 2018 +0200 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 +--- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b757173b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj --
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae9d7f69 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae9d7f69 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae9d7f69 Branch: refs/heads/master Commit: ae9d7f694a11c4dd7369e0de3651092802f78c2f Parents: d975e19 9830a3f Author: Florian Hockmann Authored: Sun May 27 19:50:29 2018 +0200 Committer: Florian Hockmann Committed: Sun May 27 19:50:29 2018 +0200 -- .../src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae9d7f69/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs --
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
docs/src/dev/developer/development-environment.asciidoc
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bfdd4c24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bfdd4c24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bfdd4c24
Branch: refs/heads/tp33
Commit: bfdd4c2477f92e8f0ef7a73fddd95d599b670ce7
Parents: d492136 3635ff6
Author: Stephen Mallette
Authored: Fri May 11 14:48:07 2018 -0400
Committer: Stephen Mallette
Committed: Fri May 11 14:48:07 2018 -0400
--
CHANGELOG.asciidoc | 4 ++
.../developer/development-environment.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 7 +++
gremlin-dotnet/pom.xml | 17 +--
gremlin-groovy/pom.xml | 6 ---
gremlin-javascript/pom.xml | 47
gremlin-python/pom.xml | 4 +-
pom.xml | 19 +---
8 files changed, 48 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/docs/src/dev/developer/development-environment.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-dotnet/pom.xml
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-groovy/pom.xml
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-javascript/pom.xml
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-python/pom.xml
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/pom.xml
--
diff --cc pom.xml
index 3ef4da9,9737fef..7fc8ac3
--- a/pom.xml
+++ b/pom.xml
@@@ -451,9 -375,10 +457,9 @@@ limitations under the License
org.apache.maven.plugins
maven-surefire-plugin
- 2.20
+ 2.21.0
-
-Dlog4j.configuration=${log4j-test.properties}
-Dbuild.dir=${project.build.directory}
--Dis.testing=true
+
-Dlog4j.configuration=${log4j-test.properties}
-Dbuild.dir=${project.build.directory} -Dis.testing=true
**/*IntegrateTest.java
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a38d68f5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a38d68f5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a38d68f5 Branch: refs/heads/master Commit: a38d68f503d6e3cdcbba60e312ffd68ff7290b7d Parents: c253e76 09fd327 Author: Florian Hockmann Authored: Fri Apr 27 09:23:28 2018 +0200 Committer: Florian Hockmann Committed: Fri Apr 27 09:23:28 2018 +0200 -- gremlin-dotnet/glv/NamingConversions.template | 50 -- 1 file changed, 50 deletions(-) --
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6aa5f2ee Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6aa5f2ee Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6aa5f2ee Branch: refs/heads/master Commit: 6aa5f2ee3e5a94de975b52b52c9f51fc5cdaa91c Parents: cd1844c 2591302 Author: Florian Hockmann Authored: Thu Apr 19 16:10:24 2018 +0200 Committer: Florian Hockmann Committed: Thu Apr 19 16:10:24 2018 +0200 -- .../src/Gremlin.Net/Driver/Exceptions/ResponseException.cs | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9a70e695 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a70e695 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a70e695 Branch: refs/heads/master Commit: 9a70e6958e7f54287cfb5364e32bf064fb48da5c Parents: 4455a1d 1592c4f Author: Stephen Mallette Authored: Fri Apr 6 20:08:02 2018 -0400 Committer: Stephen Mallette Committed: Fri Apr 6 20:08:02 2018 -0400 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/510231ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/510231ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/510231ad
Branch: refs/heads/master
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann
Committed: Mon Mar 12 20:08:44 2018 +0100
--
.../Gherkin/GherkinTestRunner.cs | 6 +-
.../Gherkin/IgnoreException.cs| 10 +-
2 files changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
public enum IgnoreReason
{
+///
+/// Lambdas are not supported on Gremlin.NET yet.
+///
LambdaNotSupported,
+
+///
+/// Deserialization of g:T on GraphSON3 is not supported.
+///
+TraversalTDeserializationNotSupported,
+
PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
}
}
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/53c84bdb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53c84bdb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53c84bdb
Branch: refs/heads/master
Commit: 53c84bdb49386e16ca6d955941be101a0fd8e1d1
Parents: 99b6da2 bbb1377
Author: Florian Hockmann
Authored: Sun Mar 11 16:16:17 2018 +0100
Committer: Florian Hockmann
Committed: Sun Mar 11 16:16:17 2018 +0100
--
.../Gherkin/GherkinTestRunner.cs| 37 +++-
.../Gherkin/IgnoreException.cs | 20 +++
2 files changed, 42 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index eb0a7e1,4a1d646..08693b2
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,14 -37,33 +37,35 @@@ namespace Gremlin.Net.IntegrationTest.G
{
public class GherkinTestRunner
{
- private static readonly IDictionary
IgnoredScenarios = new Dictionary
- {
- { "g_V_valueMapXtrueX",
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { "g_V_valueMapXtrue_name_ageX",
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX",
IgnoreReason.NeedsFurtherInvestigation },// TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack",
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
- };
+ private static readonly IDictionary
IgnoredScenarios =
+ new Dictionary
+ {
++{ "g_V_valueMapXtrueX",
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
++{ "g_V_valueMapXtrue_name_ageX",
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+ {
+
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+ IgnoreReason.NumericalValuesHaveWrongTypes
+ },
+ {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack",
IgnoreReason.NumericalValuesHaveWrongTypes},
+ {"g_V_hasIdXwithinXemptyXX_count",
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX",
IgnoreReason.PWithinWrapsArgumentsInArray},
+ {
+
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ },
+ {
+
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
+ IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+ }
+ };
private static class Keywords
{
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53c84bdb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 7733f34,c8cb29a..337a6c9
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -41,13 -41,17 +41,20 @@@ namespace Gremlin.Net.IntegrationTest.G
switch (reason)
{
case IgnoreReason.LambdaNotSupported:
- rea
[4/6] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99b6da25 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99b6da25 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/99b6da25 Branch: refs/heads/master Commit: 99b6da259f4428f338bdb1b2d4528cfb201aca2e Parents: 02e47ff ab66ed3 Author: Florian Hockmann Authored: Sat Mar 10 16:30:07 2018 +0100 Committer: Florian Hockmann Committed: Sat Mar 10 16:30:07 2018 +0100 -- .../src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
