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/06/02 15:28:06 UTC

[1/3] incubator-tinkerpop git commit: Update "current" links as part of `bin/publish-docs.sh`.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/tp31 171776bef -> 029f56b72


Update "current" links as part of `bin/publish-docs.sh`.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aca8c351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aca8c351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aca8c351

Branch: refs/heads/tp31
Commit: aca8c35125d241f61d029bbdf08f7901c1ae5e18
Parents: 96ee0ba
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 1 01:06:33 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 1 01:06:33 2016 +0200

----------------------------------------------------------------------
 README.asciidoc     |  8 ++++----
 bin/publish-docs.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aca8c351/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index e028eba..f071aa1 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -25,9 +25,9 @@ Documentation
 TinkerPop3 provides graph computing capabilities for both graph databases (OLTP) and graph analytic systems (OLAP).
 
 * link:http://tinkerpop.apache.org/[homepage (downloads)]
-* link:http://tinkerpop.apache.org/docs/3.1.3-SNAPSHOT/reference/[reference documentation]
-* link:http://tinkerpop.apache.org/javadocs/3.1.3-SNAPSHOT/core/[core javadoc]
-* link:http://tinkerpop.apache.org/javadocs/3.1.3-SNAPSHOT/full/[full javadoc]
+* link:http://tinkerpop.apache.org/docs/current/reference/[reference documentation]
+* link:http://tinkerpop.apache.org/javadocs/current/core/[core javadoc]
+* link:http://tinkerpop.apache.org/javadocs/current/full/[full javadoc]
 
 Building and Testing
 ~~~~~~~~~~~~~~~~~~~~
@@ -42,7 +42,7 @@ The zip distributions can be found in the following directories:
 . `gremlin-server/target`
 . `gremlin-console/target`
 
-Please see the link:http://tinkerpop.apache.org/docs/3.1.3-SNAPSHOT/dev/developer/#_contributing[CONTRIBUTING.asciidoc] file for more detailed information and options for building, test running and developing TinkerPop.
+Please see the link:http://tinkerpop.apache.org/docs/current/dev/developer/#_contributing[CONTRIBUTING.asciidoc] file for more detailed information and options for building, test running and developing TinkerPop.
 
 Get Started
 ~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aca8c351/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index e8eedf6..212ecde 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -56,6 +56,21 @@ cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full"
 
 pushd target/svn
 rm "docs/${VERSION}/images/tinkerpop3.graffle"
+${SVN_CMD} update --depth empty "docs/${VERSION}"
+${SVN_CMD} update --depth empty "javadocs/${VERSION}"
+
+for dir in "docs" "javadocs"
+do
+  CURRENT=$(${SVN_CMD} list "${dir}" | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
+
+  ${SVN_CMD} update --depth empty "${dir}/current"
+  ${SVN_CMD} rm "${dir}/current"
+
+  ${SVN_CMD} update --depth empty "${dir}/${CURRENT}"
+  ln -s "${CURRENT}" "${dir}/current"
+  ${SVN_CMD} update --depth empty "${dir}/current"
+done
+
 ${SVN_CMD} add * --force
 ${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
 popd


[2/3] incubator-tinkerpop git commit: Forgot to take the current (possibly unpublished) version's directory into account.

Posted by dk...@apache.org.
Forgot to take the current (possibly unpublished) version's directory into account.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b220e316
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b220e316
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b220e316

Branch: refs/heads/tp31
Commit: b220e3169381c4e9dc14176583ba32acd0cf364a
Parents: aca8c35
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 1 01:26:44 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 1 01:26:44 2016 +0200

----------------------------------------------------------------------
 bin/publish-docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b220e316/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 212ecde..99c48b9 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -61,7 +61,7 @@ ${SVN_CMD} update --depth empty "javadocs/${VERSION}"
 
 for dir in "docs" "javadocs"
 do
-  CURRENT=$(${SVN_CMD} list "${dir}" | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
+  CURRENT=$((${SVN_CMD} list "${dir}" ; ls "${dir}") | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
 
   ${SVN_CMD} update --depth empty "${dir}/current"
   ${SVN_CMD} rm "${dir}/current"


[3/3] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1003' into tp31

Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1003' into tp31


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/029f56b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/029f56b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/029f56b7

Branch: refs/heads/tp31
Commit: 029f56b7213ad43cf4a3f6aef805ea862554418c
Parents: 171776b b220e31
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 2 17:27:21 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 2 17:27:21 2016 +0200

----------------------------------------------------------------------
 README.asciidoc     |  8 ++++----
 bin/publish-docs.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------