You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/08/17 01:56:25 UTC

tinkerpop git commit: fixed a jar issue in the doc processor -- gremlin-variants can't have hadoop (and potentially others) loaded.

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1278 a1605c6ff -> 587f68673


fixed a jar issue in the doc processor -- gremlin-variants can't have hadoop (and potentially others) loaded.


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

Branch: refs/heads/TINKERPOP-1278
Commit: 587f68673f681ef6f1d867d881adcbf4ed90e589
Parents: a1605c6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 16 19:56:20 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 16 19:56:20 2016 -0600

----------------------------------------------------------------------
 docs/preprocessor/preprocess-file.sh         | 12 ++++++++++++
 docs/src/reference/gremlin-variants.asciidoc |  1 +
 2 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/587f6867/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 978c7ca..9c9a095 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -113,6 +113,18 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
       mv ext/neo4j-gremlin .ext/
       cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'Neo4jGremlinPlugin' > .ext/plugins.txt
       ;;
+    "gremlin-variants")
+      # deactivate plugin to prevent version conflicts
+      mkdir .ext
+      mv ext/neo4j-gremlin .ext/
+      mv ext/spark-gremlin .ext/
+      mv ext/giraph-gremlin .ext/
+      mv ext/hadoop-gremlin .ext/
+      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'Neo4jGremlinPlugin' > .ext/plugins.txt
+      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'SparkGremlinPlugin' > .ext/plugins.txt
+      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'GiraphGremlinPlugin' > .ext/plugins.txt
+      cat ext/plugins.txt | tee .ext/plugins.all | grep -Fv 'HadoopGremlinPlugin' > .ext/plugins.txt
+      ;;
   esac
 
   if [ -d ".ext" ]; then

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/587f6867/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index bc7a1b1..4fce04a 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -202,3 +202,4 @@ g.V().out().map(lambda: "it.get().value('name').length()").sum().toList()
 2. The default lambda language can be statically changed.
 3. A zero-arg lambda yields a string representation of a closure in Gremlin-Groovy.
 
+