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 2017/10/02 16:59:18 UTC

[1/3] tinkerpop git commit: Fixed bad test naming CTR [Forced Update!]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1661 82fb12589 -> 5e3977184 (forced update)


Fixed bad test naming CTR


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

Branch: refs/heads/TINKERPOP-1661
Commit: e509b6b7d964c43d6ba31a6563974a1904884198
Parents: d223d65
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 29 13:59:15 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 29 13:59:15 2017 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/traversal/step/map/VertexTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e509b6b7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 6db7442..7f27338 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -446,7 +446,7 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
 
     @Test
     @LoadGraphWith(MODERN)
-    public void g_VX1X_outXknowsAsStringIdX() {
+    public void g_VX1AsStringX_outXknowsX() {
         final Traversal<Vertex, Vertex> traversal = get_g_VX1X_outXknowsX(convertToVertexId("marko").toString());
         assert_g_v1_outXknowsX(traversal);
     }


[2/3] tinkerpop git commit: CTR: Download Hadoop from Apache release archives, if the requested version is not available on the download mirrors.

Posted by dk...@apache.org.
CTR: Download Hadoop from Apache release archives, if the requested version is not available on the download mirrors.


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

Branch: refs/heads/TINKERPOP-1661
Commit: 7b0bd95745aa6960fdbcafcd7e45cb2c1e499548
Parents: e509b6b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Oct 2 09:56:45 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Oct 2 09:56:45 2017 -0700

----------------------------------------------------------------------
 docker/hadoop/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b0bd957/docker/hadoop/install.sh
----------------------------------------------------------------------
diff --git a/docker/hadoop/install.sh b/docker/hadoop/install.sh
index 29dd9e1..5b61519 100755
--- a/docker/hadoop/install.sh
+++ b/docker/hadoop/install.sh
@@ -24,9 +24,10 @@ HADOOP_BASENAME="hadoop-${HADOOP_VERSION}"
 
 APACHE_MIRROR=$(curl -s http://www.apache.org/dyn/closer.cgi | grep -o '<a href=".*"><strong>' | cut -f2 -d '"' | head -n1)
 HADOOP_DOWNLOAD_URL="${APACHE_MIRROR}hadoop/common/${HADOOP_BASENAME}/${HADOOP_BASENAME}.tar.gz"
+ALT_HADOOP_DOWNLOAD_URL="https://archive.apache.org/dist/hadoop/common/${HADOOP_BASENAME}/${HADOOP_BASENAME}.tar.gz"
 
 pushd /usr/local/lib > /dev/null
-curl ${HADOOP_DOWNLOAD_URL} | tar xz
+(curl -f ${HADOOP_DOWNLOAD_URL} || curl ${ALT_HADOOP_DOWNLOAD_URL}) | tar xz
 popd > /dev/null
 
 cat >> ~/.bashrc <<EOF


[3/3] tinkerpop git commit: Update links to all docs pages in Docker build and emulate the published directory structure. This way the docs are easier to navigate in local builds.

Posted by dk...@apache.org.
Update links to all docs pages in Docker build and emulate the published directory structure. This way the docs are easier to navigate in local builds.


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

Branch: refs/heads/TINKERPOP-1661
Commit: 5e3977184523e005ac60e3dcaac199f3d63335fd
Parents: 7b0bd95
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Sep 29 10:14:46 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Oct 2 09:58:59 2017 -0700

----------------------------------------------------------------------
 docker/scripts/build.sh | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5e397718/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index bc22de9..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -96,8 +96,14 @@ if [ ! -z "${BUILD_USER_DOCS}" ]; then
   mkdir -p ~/.groovy
   cp docker/resources/groovy/grapeConfig.xml ~/.groovy/
   rm -rf /tmp/neo4j
+  grep -l 'http://tinkerpop.apache.org/docs/x.y.z' $(find docs/src -name "*.asciidoc" | grep -v '^.docs/src/upgrade/') | xargs sed -i 's@http://tinkerpop.apache.org/docs/x.y.z@/docs/x.y.z@g'
   bin/process-docs.sh || exit 1
 
+  # emulate published directory structure
+  VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep '<version>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
+  mkdir target/docs/htmlsingle/docs
+  ln -s .. target/docs/htmlsingle/docs/${VERSION}
+
   # start a simple HTTP server
   IP=$(ifconfig | grep -o 'inet addr:[0-9.]*' | cut -f2 -d ':' | head -n1)
   cd target/docs/htmlsingle/