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/ef18e4ec Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef18e4ec Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef18e4ec Branch: refs/heads/master Commit: ef18e4ecaebf5132d37b4e52e6fa7112b79b5a26 Parents: 0b7d71b Author: Marko A. Rodriguez <[email protected]> Authored: Tue Sep 13 08:20:22 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Tue Nov 29 04:54:21 2016 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 3 +++ giraph-gremlin/pom.xml | 2 +- hadoop-gremlin/pom.xml | 18 +++++++----------- pom.xml | 2 +- spark-gremlin/pom.xml | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef18e4ec/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4103280..37cf843 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -167,6 +167,9 @@ This release also includes changes from <<release-3-1-5, 3.1.5>>. * Produced better errors in `readGraph` of `GryoReader` and `GraphSONReader` if a `Vertex` cannot be found in the cache on edge loading. * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`. * New build options for `gremlin-python` where `-DglvPython` is no longer required. +======= +* Bumped to support Spark 2.0.0. +>>>>>>> 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. * Added missing `InetAddress` to GraphSON extension module. * Added new recipe for "Pagination". * Added new recipe for "Recommendation". http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef18e4ec/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index 25d96ec..9a21f36 100644 --- a/giraph-gremlin/pom.xml +++ b/giraph-gremlin/pom.xml @@ -235,7 +235,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/ef18e4ec/hadoop-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml index b573852..927b2af 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> @@ -180,7 +176,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/ef18e4ec/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0052d76..8199586 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ limitations under the License. <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <skipIntegrationTests>true</skipIntegrationTests> <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/ef18e4ec/spark-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml index 02a3a05..7dc8504 100644 --- a/spark-gremlin/pom.xml +++ b/spark-gremlin/pom.xml @@ -415,7 +415,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>
