You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/11/03 17:14:31 UTC
[tinkerpop] branch TINKERPOP-2085 created (now 49184f3)
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a change to branch TINKERPOP-2085
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
at 49184f3 TINKERPOP-2085 Remove dependency on Mono WIP
This branch includes the following new commits:
new 49184f3 TINKERPOP-2085 Remove dependency on Mono WIP
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.
[tinkerpop] 01/01: TINKERPOP-2085 Remove dependency on Mono WIP
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch TINKERPOP-2085
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 49184f3eae48b1b4e1548e5da67bda337606e853
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Sat Nov 3 18:13:51 2018 +0100
TINKERPOP-2085 Remove dependency on Mono WIP
NuGet packages can currently only be pushed on non-Windows system when
an API key is specified explicitly each time. Docs also need to be
updated.
---
.gitignore | 1 -
docker/Dockerfile | 4 +-
gremlin-dotnet/Gremlin.Net.sln | 2 +-
.../glv/Gremlin.Net.Template.csproj.template | 2 +-
.../glv/Gremlin.Net.Template.nuspec.template | 6 +-
gremlin-dotnet/glv/generate.groovy | 2 +-
.../Gremlin.Net.Template.csproj | 32 +------
.../Gremlin.Net.Template.nuspec | 8 +-
.../{ => content}/.template.config/template.json | 0
.../{ => content}/Gremlin.Net.Template.csproj | 2 +-
.../Gremlin.Net.Template/{ => content}/Program.cs | 0
.../Gremlin.Net.Template/{ => content}/Service.cs | 0
gremlin-dotnet/src/pom.xml | 100 ++-------------------
.../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
14 files changed, 25 insertions(+), 136 deletions(-)
diff --git a/.gitignore b/.gitignore
index 61da26c..ab5f492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,5 +31,4 @@ tools/
.vs/
*nupkg
NuGet.Config
-nuget*.exe
/Dockerfile
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9ae74aa..5d04834 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,12 +25,10 @@ RUN apt-get update \
&& add-apt-repository -y ppa:webupd8team/java \
&& sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list' \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 \
- && sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-trusty main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list' \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
&& apt-get update \
&& apt-get install -y oracle-java8-installer curl gawk git maven openssh-server subversion zip \
&& sh -c 'curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg' \
- && apt-get install -y --force-yes dotnet-sdk-2.1.101 python python-dev python3-dev python-pip build-essential mono-devel \
+ && apt-get install -y --force-yes dotnet-sdk-2.1.101 python python-dev python3-dev python-pip build-essential \
&& pip install virtualenv virtualenvwrapper \
&& pip install --upgrade pip \
&& rm -rf /var/lib/apt/lists/* /var/cache/oracle-jdk8-installer
diff --git a/gremlin-dotnet/Gremlin.Net.sln b/gremlin-dotnet/Gremlin.Net.sln
index 3f2b2b4..547d58e 100644
--- a/gremlin-dotnet/Gremlin.Net.sln
+++ b/gremlin-dotnet/Gremlin.Net.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.UnitTest", "tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.IntegrationTest", "test\Gremlin.Net.IntegrationTest\Gremlin.Net.IntegrationTest.csproj", "{CC54ABE3-13D2-491C-81E2-4D0355ABFA93}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.Template", "src\Gremlin.Net.Template\Gremlin.Net.Template.csproj", "{A9D2567A-6FD0-452B-A2F9-4256FE513ADD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.Template", "src\Gremlin.Net.Template\content\Gremlin.Net.Template.csproj", "{A9D2567A-6FD0-452B-A2F9-4256FE513ADD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.Template.IntegrationTest", "test\Gremlin.Net.Template.IntegrationTest\Gremlin.Net.Template.IntegrationTest.csproj", "{3BFC3559-E317-4327-AFB7-CFBB31E1C868}"
EndProject
diff --git a/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
index 9a6adf0..51d3ea1 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
@@ -26,7 +26,7 @@ limitations under the License.
<ItemGroup>
<!-- We need both reference elements until this is resolved: https://github.com/dotnet/sdk/issues/1151 -->
- <ProjectReference Include="../Gremlin.Net/Gremlin.Net.csproj" />
+ <ProjectReference Include="../../Gremlin.Net/Gremlin.Net.csproj" />
<PackageReference Include="Gremlin.Net" Version="$projectVersion" />
</ItemGroup>
diff --git a/gremlin-dotnet/glv/Gremlin.Net.Template.nuspec.template b/gremlin-dotnet/glv/Gremlin.Net.Template.nuspec.template
index 72ad382..f047666 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.Template.nuspec.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.Template.nuspec.template
@@ -14,8 +14,8 @@
</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" />
+ <file src="content/.template.config/template.json" target="content/.template.config" />
+ <file src="content/Gremlin.Net.Template.csproj" target="content" />
+ <file src="content/*.cs" target="content" />
</files>
</package>
\ No newline at end of file
diff --git a/gremlin-dotnet/glv/generate.groovy b/gremlin-dotnet/glv/generate.groovy
index 2d8b005..b0b34e0 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -378,7 +378,7 @@ def csprojTemplate = engine.createTemplate(new File("${projectBaseDir}/glv/Greml
def csprojFile = new File("${projectBaseDir}/src/Gremlin.Net/Gremlin.Net.csproj")
csprojFile.newWriter().withWriter{ it << csprojTemplate }
def templateCsprojTemplate = engine.createTemplate(new File("${projectBaseDir}/glv/Gremlin.Net.Template.csproj.template")).make(["projectVersion":versionToUse])
-def templateCsprojFile = new File("${projectBaseDir}/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj")
+def templateCsprojFile = new File("${projectBaseDir}/src/Gremlin.Net.Template/content/Gremlin.Net.Template.csproj")
templateCsprojFile.newWriter().withWriter{ it << templateCsprojTemplate }
def nuspecTemplate = engine.createTemplate(new File("${projectBaseDir}/glv/Gremlin.Net.Template.nuspec.template")).make(["projectVersion":versionToUse])
def nuspecFile = new File("${projectBaseDir}/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec")
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
index 903a23b..1884304 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -1,33 +1,7 @@
-<!--
-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>
+ <NuspecFile>Gremlin.Net.Template.nuspec</NuspecFile>
+ <DefaultItemExcludes>$(DefaultItemExcludes);content/**/*</DefaultItemExcludes>
</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.2.11-SNAPSHOT" />
- </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
index b34254e..1582380 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
@@ -14,8 +14,8 @@
</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>
+ <file src="content/.template.config/template.json" target="content/.template.config" />
+ <file src="content/Gremlin.Net.Template.csproj" target="content" />
+ <file src="content/*.cs" target="content" />
+ </files>
</package>
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/.template.config/template.json b/gremlin-dotnet/src/Gremlin.Net.Template/content/.template.config/template.json
similarity index 100%
rename from gremlin-dotnet/src/Gremlin.Net.Template/.template.config/template.json
rename to gremlin-dotnet/src/Gremlin.Net.Template/content/.template.config/template.json
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/content/Gremlin.Net.Template.csproj
similarity index 94%
copy from gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
copy to gremlin-dotnet/src/Gremlin.Net.Template/content/Gremlin.Net.Template.csproj
index 903a23b..cc7c9d2 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/content/Gremlin.Net.Template.csproj
@@ -26,7 +26,7 @@ limitations under the License.
<ItemGroup>
<!-- We need both reference elements until this is resolved: https://github.com/dotnet/sdk/issues/1151 -->
- <ProjectReference Include="../Gremlin.Net/Gremlin.Net.csproj" />
+ <ProjectReference Include="../../Gremlin.Net/Gremlin.Net.csproj" />
<PackageReference Include="Gremlin.Net" Version="3.2.11-SNAPSHOT" />
</ItemGroup>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Program.cs b/gremlin-dotnet/src/Gremlin.Net.Template/content/Program.cs
similarity index 100%
rename from gremlin-dotnet/src/Gremlin.Net.Template/Program.cs
rename to gremlin-dotnet/src/Gremlin.Net.Template/content/Program.cs
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Service.cs b/gremlin-dotnet/src/Gremlin.Net.Template/content/Service.cs
similarity index 100%
rename from gremlin-dotnet/src/Gremlin.Net.Template/Service.cs
rename to gremlin-dotnet/src/Gremlin.Net.Template/content/Service.cs
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 288b8de..c5f262c 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -26,10 +26,6 @@ limitations under the License.
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
<packaging>${packaging.type}</packaging>
- <properties>
- <nugetVersion>4.4.1</nugetVersion>
- <nugetExe>nuget-${nugetVersion}.exe</nugetExe>
- </properties>
<build>
<plugins>
@@ -115,93 +111,15 @@ limitations under the License.
</properties>
<build>
<plugins>
- <!--
- not seeing much point to making this OS agnostic really. as far as it is known, no one who does
- deployments will do so from a windows machine. this part of the build requires mono. note that
- the "correct" version of nuget is downloaded as part of the process.
- -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>pack-dotnet-template</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
- <if>
- <available file="mono" filepath="${env.PATH}"/>
- <then>
- <if>
- <available file="${nugetExe}"/>
- <then>
- <echo>nuget.exe already downloaded.</echo>
- </then>
-
- <else>
- <exec executable="wget" failonerror="true">
- <arg line="https://dist.nuget.org/win-x86-commandline/v${nugetVersion}/nuget.exe -O ${nugetExe}"/>
- </exec>
- </else>
- </if>
- <exec executable="mono" failonerror="true">
- <arg line="${nugetExe} pack Gremlin.Net.Template/Gremlin.Net.Template.nuspec"/>
- </exec>
- </then>
- <else>
- <echo>Skipping packaging of Gremlin.Net.Template as mono is not available</echo>
- </else>
- </if>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>deploy-nuget</id>
- <phase>deploy</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
- <if>
- <available file="${nugetExe}"/>
- <then>
- <echo>nuget.exe already downloaded.</echo>
- </then>
-
- <else>
- <exec executable="wget" failonerror="true">
- <arg line="https://dist.nuget.org/win-x86-commandline/v${nugetVersion}/nuget.exe -O ${nugetExe}"/>
- </exec>
- </else>
- </if>
-
- <!--
- until https://github.com/NuGet/Home/issues/4095 we have to have to specify
- the "ConfigFile" option to nuget.
- -->
- <exec executable="mono" failonerror="true">
- <arg line="${nugetExe} push Gremlin.Net/bin/Gremlin.Net.${project.version}.nupkg -Source https://api.nuget.org/v3/index.json -ConfigFile ${user.home}/.config/NuGet/NuGet.Config"/>
- </exec>
- <exec executable="mono" failonerror="true">
- <arg line="${nugetExe} push Gremlin.Net.Template.${project.version}.nupkg -Source https://api.nuget.org/v3/index.json -ConfigFile ${user.home}/.config/NuGet/NuGet.Config"/>
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>20020829</version>
- </dependency>
- </dependencies>
+ <groupId>org.eobjects.build</groupId>
+ <artifactId>dotnet-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <nugetPushEnabled>true</nugetPushEnabled>
+ <repository>https://api.nuget.org/v3/index.json</repository>
+ <nugetAddEnabled>false</nugetAddEnabled>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -243,7 +161,7 @@ def csprojTemplate = engine.createTemplate(new File('${project.parent.basedir}/g
def csprojFile = new File('${project.basedir}/Gremlin.Net/Gremlin.Net.csproj')
csprojFile.newWriter().withWriter{ it << csprojTemplate }
def templateCsprojTemplate = engine.createTemplate(new File('${project.parent.basedir}/glv/Gremlin.Net.Template.csproj.template')).make(["projectVersion":versionToUse])
-def templateCsprojFile = new File('${project.basedir}/Gremlin.Net.Template/Gremlin.Net.Template.csproj')
+def templateCsprojFile = new File('${project.basedir}/Gremlin.Net.Template/content/Gremlin.Net.Template.csproj')
templateCsprojFile.newWriter().withWriter{ it << templateCsprojTemplate }
def nuspecTemplate = engine.createTemplate(new File('${project.parent.basedir}/glv/Gremlin.Net.Template.nuspec.template')).make(["projectVersion":versionToUse])
def nuspecFile = new File('${project.basedir}/Gremlin.Net.Template/Gremlin.Net.Template.nuspec')
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
index 3607e68..2d7e809 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\Gremlin.Net.Template\Gremlin.Net.Template.csproj" />
+ <ProjectReference Include="..\..\src\Gremlin.Net.Template\content\Gremlin.Net.Template.csproj" />
</ItemGroup>
</Project>