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/09/13 00:04:33 UTC
tinkerpop git commit: jesus. that was a depedency hell like only
spark can provide. got SparkServer working with GremlinConsole and HDFS.
Phew... Also, bumped to Hadoop 2.7.3 (from 2.7.2).
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1389 64e2c7b7d -> 385801b88
jesus. that was a depedency hell like only spark can provide. got SparkServer working with GremlinConsole and HDFS. Phew... Also, bumped to Hadoop 2.7.3 (from 2.7.2).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/385801b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/385801b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/385801b8
Branch: refs/heads/TINKERPOP-1389
Commit: 385801b88030b3502217d2f04f177b3d08304b85
Parents: 64e2c7b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 12 18:04:30 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Sep 12 18:04:30 2016 -0600
----------------------------------------------------------------------
hadoop-gremlin/pom.xml | 16 ++++++++++------
pom.xml | 2 +-
spark-gremlin/pom.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
3 files changed, 51 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/385801b8/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 65cd492..f90819f 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -27,12 +27,16 @@ limitations under the License.
<name>Apache TinkerPop :: Hadoop Gremlin</name>
<dependencyManagement>
<dependencies>
- <dependency>
- <!-- see: https://github.com/apache/hadoop/pull/84 -->
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
- </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.8.0.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/385801b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 33dd8e2..0d3b9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@ limitations under the License.
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
<slf4j.version>1.7.21</slf4j.version>
- <hadoop.version>2.7.2</hadoop.version>
+ <hadoop.version>2.7.3</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/385801b8/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 488f060..9e57c7e 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -112,7 +112,7 @@
<!-- SPARK -->
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.10</artifactId>
+ <artifactId>spark-core_2.11</artifactId>
<version>2.0.0</version>
<exclusions>
<!-- self conflicts -->
@@ -129,6 +129,10 @@
<artifactId>scala-reflect</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
@@ -208,13 +212,32 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- consistent dependencies -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.10.5</version>
+ <version>2.11.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <version>1.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -236,6 +259,16 @@
<artifactId>snappy-java</artifactId>
<version>1.1.1.7</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.0.29.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.8.0.Final</version>
+ </dependency>
<!-- TEST -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -247,6 +280,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -397,7 +434,7 @@
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.3
</Gremlin-Plugin-Dependencies>
<!-- deletes the servlet-api jar from the path after install - causes conflicts -->
<Gremlin-Plugin-Paths>servlet-api-2.5.jar=</Gremlin-Plugin-Paths>