Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 07846200CF6 for ; Mon, 18 Sep 2017 14:32:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 05F491609DE; Mon, 18 Sep 2017 12:32:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4BB241609D8 for ; Mon, 18 Sep 2017 14:32:15 +0200 (CEST) Received: (qmail 27374 invoked by uid 500); 18 Sep 2017 12:32:14 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 27363 invoked by uid 99); 18 Sep 2017 12:32:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2017 12:32:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7574F55FE; Mon, 18 Sep 2017 12:32:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Mon, 18 Sep 2017 12:32:13 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] tinkerpop git commit: TINKERPOP-1731 Fix encoding of template CTR [Forced Update!] archived-at: Mon, 18 Sep 2017 12:32:16 -0000 Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1785 aac2dd722 -> 2c5077fa0 (forced update) TINKERPOP-1731 Fix encoding of template CTR The template file included BOM bytes which resulted in an invalid csproj file when docker was used for the build. The template engine still has problems with special characters with docker, but at least the build works now. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bf128ae Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bf128ae Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bf128ae Branch: refs/heads/TINKERPOP-1785 Commit: 3bf128ae9f9d6f73675705a958b7b4102572eaaa Parents: 9402e4e Author: florianhockmann Authored: Sun Sep 17 16:26:53 2017 +0200 Committer: florianhockmann Committed: Sun Sep 17 16:26:53 2017 +0200 ---------------------------------------------------------------------- docker/scripts/build.sh | 6 ++---- gremlin-dotnet/glv/Gremlin.Net.csproj.template | 2 +- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/docker/scripts/build.sh ---------------------------------------------------------------------- diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index dff60b5..bc22de9 100755 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -64,10 +64,8 @@ if [ -d "/usr/src/tinkermem" ]; then fi touch gremlin-python/.glv - -# remove these until TINKERPOP-1731 is settled -rm gremlin-dotnet/src/.glv -rm gremlin-dotnet/test/.glv +touch gremlin-dotnet/src/.glv +touch gremlin-dotnet/test/.glv # use a custom maven settings.xml if [ -r "settings.xml" ]; then http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/gremlin-dotnet/glv/Gremlin.Net.csproj.template ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template index b55eecb..58fad18 100644 --- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template +++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template @@ -1,4 +1,4 @@ -