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 2017/07/21 17:00:16 UTC
[1/3] tinkerpop git commit: TINKERPOP-1715: update spark version to
2.2 That required: - more spark conflicting dependency exclusion in pom.xml -
more spark and scala classes registration in tinkerPop gryo
Repository: tinkerpop
Updated Branches:
refs/heads/master 726b4050c -> 021362506
TINKERPOP-1715: update spark version to 2.2
That required:
- more spark conflicting dependency exclusion in pom.xml
- more spark and scala classes registration in tinkerPop gryo
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9e8cc5a1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9e8cc5a1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9e8cc5a1
Branch: refs/heads/master
Commit: 9e8cc5a1b2893d9aab9da76dee61e3604ce7aadc
Parents: cbdfa00
Author: artemaliev <artem.aliev@gmail,com>
Authored: Mon Jul 17 13:55:45 2017 +0300
Committer: artemaliev <artem.aliev@gmail,com>
Committed: Mon Jul 17 14:25:42 2017 +0300
----------------------------------------------------------------------
gremlin-groovy/pom.xml | 4 +++
spark-gremlin/pom.xml | 38 ++++++++++++++++----
.../structure/io/gryo/GryoRegistrator.java | 3 ++
.../spark/structure/io/gryo/GryoSerializer.java | 7 ++++
4 files changed, 45 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e8cc5a1/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index fdf6caf..3a4d643 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -93,6 +93,10 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e8cc5a1/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 12107a7..fb69063 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -108,28 +108,52 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.11</artifactId>
- <version>2.0.2</version>
+ <version>2.2.0</version>
<exclusions>
<!-- self conflicts -->
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
<exclusion>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-xml_2.11</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e8cc5a1/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
index 5fd76ea..13fc787 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
@@ -200,6 +200,9 @@ public class GryoRegistrator implements KryoRegistrator {
try {
m.put(Class.forName("scala.reflect.ClassTag$$anon$1"), new JavaSerializer());
m.put(Class.forName("scala.reflect.ManifestFactory$$anon$1"), new JavaSerializer());
+ m.put(Class.forName("org.apache.spark.internal.io.FileCommitProtocol$TaskCommitMessage"), new JavaSerializer());
+ m.put(Class.forName("org.apache.spark.internal.io.FileCommitProtocol$EmptyTaskCommitMessage$"), new JavaSerializer());
+
} catch (final ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e8cc5a1/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
index 677db12..ec5ae9b 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoSerializer.java
@@ -141,6 +141,13 @@ public final class GryoSerializer extends Serializer implements Serializable {
super.register(GryoIo.class, BoxedUnit.class, null);
super.register(GryoIo.class, Class.forName("scala.reflect.ClassTag$$anon$1"), new JavaSerializer());
super.register(GryoIo.class, Class.forName("scala.reflect.ManifestFactory$$anon$1"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("org.apache.spark.internal.io.FileCommitProtocol$TaskCommitMessage"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("org.apache.spark.internal.io.FileCommitProtocol$EmptyTaskCommitMessage$"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("scala.collection.immutable.Map$EmptyMap$"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("scala.collection.immutable.Map"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("scala.None$"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("scala.Some$"), new JavaSerializer());
+ super.register(GryoIo.class, Class.forName("scala.Some"), new JavaSerializer());
super.register(GryoIo.class, WrappedArray.ofRef.class, new WrappedArraySerializer());
super.register(GryoIo.class, MessagePayload.class, null);
super.register(GryoIo.class, ViewIncomingPayload.class, null);
[2/3] tinkerpop git commit: TINKERPOP-1715: rollback gremlin-groovy
unnecessary changes
Posted by ok...@apache.org.
TINKERPOP-1715: rollback gremlin-groovy unnecessary changes
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d544a536
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d544a536
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d544a536
Branch: refs/heads/master
Commit: d544a53604ebf092badac388b09a7a7e2c430c3c
Parents: 9e8cc5a
Author: artemaliev <artem.aliev@gmail,com>
Authored: Mon Jul 17 16:45:05 2017 +0300
Committer: artemaliev <artem.aliev@gmail,com>
Committed: Mon Jul 17 16:45:05 2017 +0300
----------------------------------------------------------------------
gremlin-groovy/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d544a536/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 3a4d643..fdf6caf 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -93,10 +93,6 @@ limitations under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<repositories>
<repository>
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1715' of
https://github.com/artem-aliev/tinkerpop
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1715' of https://github.com/artem-aliev/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02136250
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02136250
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02136250
Branch: refs/heads/master
Commit: 021362506c9912b7b08c7ca4f605852965900c3e
Parents: 726b405 d544a53
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jul 21 11:00:02 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jul 21 11:00:02 2017 -0600
----------------------------------------------------------------------
spark-gremlin/pom.xml | 38 ++++++++++++++++----
.../structure/io/gryo/GryoRegistrator.java | 3 ++
.../spark/structure/io/gryo/GryoSerializer.java | 7 ++++
3 files changed, 41 insertions(+), 7 deletions(-)
----------------------------------------------------------------------