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 2016/09/12 11:18:19 UTC
[1/2] tinkerpop git commit: Update script for the docs was using the
version from `pom.xml` in its commit message,
but actually chooses the right version from SVN. This commit fixes the commit
message.
Repository: tinkerpop
Updated Branches:
refs/heads/master 4cabb9d11 -> 422263009
Update script for the docs was using the version from `pom.xml` in its commit message, but actually chooses the right version from SVN.
This commit fixes the commit message.
CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2500ba97
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2500ba97
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2500ba97
Branch: refs/heads/master
Commit: 2500ba97c0d3e2587cde011cd021ad7e1c9f1735
Parents: 0142324
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Sep 12 13:15:56 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Sep 12 13:15:56 2016 +0200
----------------------------------------------------------------------
bin/update-current-docs.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2500ba97/bin/update-current-docs.sh
----------------------------------------------------------------------
diff --git a/bin/update-current-docs.sh b/bin/update-current-docs.sh
index 2169583..84ee75c 100755
--- a/bin/update-current-docs.sh
+++ b/bin/update-current-docs.sh
@@ -31,7 +31,7 @@ read -s -p "Password for SVN user ${USERNAME}: " PASSWORD
echo
SVN_CMD="svn --no-auth-cache --username=${USERNAME} --password=${PASSWORD}"
-VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
+CURRENT=""
mkdir -p target/svn
rm -rf target/svn/*
@@ -53,5 +53,5 @@ do
done
${SVN_CMD} add * --force
-${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
+${SVN_CMD} commit -m "Deploy docs for TinkerPop ${CURRENT}"
popd
[2/2] tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tinkerpop
Posted by dk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42226300
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42226300
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42226300
Branch: refs/heads/master
Commit: 422263009412a3d08c5fc6e781da4f3f9a129f57
Parents: 2500ba9 4cabb9d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Sep 12 13:17:50 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Sep 12 13:17:50 2016 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 8 ++-
docs/src/dev/developer/administration.asciidoc | 43 +++++++++++++++-
docs/src/dev/developer/release.asciidoc | 52 ++++++++++++--------
.../upgrade/release-3.1.x-incubating.asciidoc | 5 ++
4 files changed, 86 insertions(+), 22 deletions(-)
----------------------------------------------------------------------