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 2015/09/08 19:04:26 UTC
incubator-tinkerpop git commit: Spark, Giraph,
and Hadoop are now all split up and don't have such crazy pom.xml
dependency issues. Still need to find the minimum exclusions needed for Spark
and then will convert to Spark 1.4.1.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/hadoop_split ac56b3095 -> 1303acfcd
Spark, Giraph, and Hadoop are now all split up and don't have such crazy pom.xml dependency issues. Still need to find the minimum exclusions needed for Spark and then will convert to Spark 1.4.1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1303acfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1303acfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1303acfc
Branch: refs/heads/hadoop_split
Commit: 1303acfcd56e588bfa7094b5b0cdcb81d71469f7
Parents: ac56b30
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 8 11:04:48 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 8 11:04:48 2015 -0600
----------------------------------------------------------------------
.../traverser/B_O_S_SE_SL_Traverser.java | 2 +-
spark-gremlin/pom.xml | 60 ++++++++++++++------
2 files changed, 43 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1303acfc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
index b69db85..5dc1313 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_O_S_SE_SL_Traverser.java
@@ -121,6 +121,6 @@ public class B_O_S_SE_SL_Traverser<T> extends B_O_Traverser<T> {
&& ((B_O_S_SE_SL_Traverser) object).get().equals(this.t)
&& ((B_O_S_SE_SL_Traverser) object).getStepId().equals(this.getStepId())
&& ((B_O_S_SE_SL_Traverser) object).loops() == this.loops()
- && (null == this.sack || null != this.sideEffects.getSackMerger());
+ && (null == this.sack || (null != this.sideEffects && null != this.sideEffects.getSackMerger())); // hmmm... serialization in OLAP destroys the transient sideEffects
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1303acfc/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index bf33ae5..f1c696e 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -46,28 +46,24 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.giraph</groupId>
- <artifactId>giraph-core</artifactId>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
</exclusion>
<exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -77,6 +73,27 @@
<artifactId>spark-core_2.10</artifactId>
<version>1.2.1</version>
<exclusions>
+ <!-- self conflicts -->
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
<!-- gremlin-core conflicts -->
<exclusion>
<groupId>org.slf4j</groupId>
@@ -95,17 +112,24 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
+ <!-- hadoop conflicts -->
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
<!-- lgpl conflicts -->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>findbugs</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
</exclusions>
</dependency>
+ <!-- consistent dependencies -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.3</version>
+ </dependency>
<!-- TEST -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>