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 14:20:41 UTC
tinkerpop git commit: had to go back down to Hadoop 2.7.2 because
Hadoop 2.7.3 changed a method signature that GiraphJob calls and thus,
Giraph fails. Dar. Cleaned up pom.xmls a bit and updated CHANGELOG. This
branch is ready to be tested on the Blade cl
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1389 385801b88 -> 302df7c80
had to go back down to Hadoop 2.7.2 because Hadoop 2.7.3 changed a method signature that GiraphJob calls and thus, Giraph fails. Dar. Cleaned up pom.xmls a bit and updated CHANGELOG. This branch is ready to be tested on the Blade cluster against the Friendster dataset.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/302df7c8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/302df7c8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/302df7c8
Branch: refs/heads/TINKERPOP-1389
Commit: 302df7c8033b0daa7be9d13828b4603c3926ea62
Parents: 385801b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 13 08:20:22 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 13 08:20:22 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
giraph-gremlin/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 18 +++++++-----------
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
5 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/302df7c8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bda26e6..489301a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to support Spark 2.0.0.
* Added missing `InetAddress` to GraphSON extension module.
[[release-3-2-2]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/302df7c8/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index c95a1a0..99ec46a 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -254,7 +254,7 @@ limitations under the License.
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:${hadoop.version}
</Gremlin-Plugin-Dependencies>
</manifestEntries>
</archive>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/302df7c8/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index f90819f..94c0163 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -25,20 +25,16 @@ limitations under the License.
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.0.29.Final</version>
- </dependency>
+ <dependencyManagement>
+ <dependencies>
<dependency>
+ <!-- see: https://github.com/apache/hadoop/pull/84 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.8.0.Final</version>
+ <version>3.7.1.Final</version>
</dependency>
- </dependencies>
- </dependencyManagement>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -181,7 +177,7 @@ limitations under the License.
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.2
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:${hadoop.version}
</Gremlin-Plugin-Dependencies>
</manifestEntries>
</archive>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/302df7c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d3b9fb..33dd8e2 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.3</hadoop.version>
+ <hadoop.version>2.7.2</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/302df7c8/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 9e57c7e..13012de 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -434,7 +434,7 @@
<configuration>
<archive>
<manifestEntries>
- <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:2.7.3
+ <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:${hadoop.version}
</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>