You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2018/06/21 18:02:41 UTC
[45/50] [abbrv] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a54760d9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a54760d9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a54760d9
Branch: refs/heads/shortest-path-wip
Commit: a54760d9acd6de26c6b4b48f34e09ace1fad44b4
Parents: d16153d c43a882
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Tue Jun 19 19:13:39 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Tue Jun 19 19:13:39 2018 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
CHANGELOG.asciidoc | 1 +
docker/Dockerfile | 4 +-
.../developer/development-environment.asciidoc | 14 ++++-
docs/src/dev/developer/release.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 31 +++++++++-
gremlin-dotnet/Gremlin.Net.sln | 19 ++++++-
.../glv/Gremlin.Net.Template.csproj.template | 33 +++++++++++
.../glv/Gremlin.Net.Template.nuspec.template | 21 +++++++
gremlin-dotnet/glv/generate.groovy | 8 ++-
.../.template.config/template.json | 14 +++++
.../Gremlin.Net.Template.csproj | 33 +++++++++++
.../Gremlin.Net.Template.nuspec | 21 +++++++
.../src/Gremlin.Net.Template/Program.cs | 50 ++++++++++++++++
.../src/Gremlin.Net.Template/README.md | 46 +++++++++++++++
.../src/Gremlin.Net.Template/Service.cs | 43 ++++++++++++++
.../Process/Traversal/GraphTraversal.cs | 9 ---
gremlin-dotnet/src/pom.xml | 60 ++++++++++++++++++--
.../Gremlin.Net.Template.IntegrationTest.csproj | 20 +++++++
.../ServiceTests.cs | 57 +++++++++++++++++++
pom.xml | 2 +
21 files changed, 464 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
----------------------------------------------------------------------
diff --cc gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
index 0000000,22de9c6..3748e83
mode 000000,100644..100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@@ -1,0 -1,33 +1,33 @@@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <!-- THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml -->
+ <Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>netcoreapp2.0</TargetFramework>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <!-- We need both reference elements until this is resolved: https://github.com/dotnet/sdk/issues/1151 -->
+ <ProjectReference Include="../Gremlin.Net/Gremlin.Net.csproj" />
- <PackageReference Include="Gremlin.Net" Version="3.3.4-SNAPSHOT" />
++ <PackageReference Include="Gremlin.Net" Version="3.4.0-SNAPSHOT" />
+ </ItemGroup>
+
+ </Project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
----------------------------------------------------------------------
diff --cc gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
index 0000000,ddb50d8..90cceb6
mode 000000,100644..100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
@@@ -1,0 -1,21 +1,21 @@@
+ <?xml version="1.0" encoding="utf-8"?>
+ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <id>Gremlin.Net.Template</id>
+ <title>Gremlin.Net Template</title>
- <version>3.3.4-SNAPSHOT</version>
++ <version>3.4.0-SNAPSHOT</version>
+ <description>Gremlin.Net template to create a console application with dotnet new.</description>
+ <authors>Apache TinkerPop</authors>
+ <licenseUrl>https://github.com/apache/tinkerpop/blob/master/LICENSE</licenseUrl>
+ <projectUrl>http://tinkerpop.apache.org</projectUrl>
+ <tags>TinkerPop Gremlin Gremlin.Net</tags>
+ <packageTypes>
+ <packageType name="Template" />
+ </packageTypes>
+ </metadata>
+ <files>
+ <file src=".template.config/template.json" target="content/.template.config" />
+ <file src="Gremlin.Net.Template.csproj" target="content" />
+ <file src="*.cs" target="content" />
+ </files>
+ </package>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a54760d9/pom.xml
----------------------------------------------------------------------