Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1535 [created] f1d628f3f
bumped to support Giraph 1.2.0. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f1d628f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f1d628f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f1d628f3 Branch: refs/heads/TINKERPOP-1535 Commit: f1d628f3fceec24dfc5e2c559fbd2bea214a68a0 Parents: fcd623c Author: Marko A. Rodriguez <[email protected]> Authored: Tue Jul 25 14:21:36 2017 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Tue Jul 25 14:21:36 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + giraph-gremlin/pom.xml | 2 +- .../gremlin/giraph/process/computer/GiraphMessageCombiner.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 393fe44..14069fb 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Bumped to support Giraph 1.2.0. * Bumped to support Spark 2.2.0. * Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not. * Removed previously deprecated `GraphTraversal.selectV3d0()` step. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index e954bf6..1a1ebfe 100644 --- a/giraph-gremlin/pom.xml +++ b/giraph-gremlin/pom.xml @@ -64,7 +64,7 @@ limitations under the License. <dependency> <groupId>org.apache.giraph</groupId> <artifactId>giraph-core</artifactId> - <version>1.1.0-hadoop2</version> + <version>1.2.0-hadoop2</version> <exclusions> <!-- self conflicts --> <exclusion> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1d628f3/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java ---------------------------------------------------------------------- diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java index 4d725b2..4c2a12e 100644 --- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java +++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java @@ -30,7 +30,7 @@ import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ -public final class GiraphMessageCombiner extends org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable> implements ImmutableClassesGiraphConfigurable { +public final class GiraphMessageCombiner implements org.apache.giraph.combiner.MessageCombiner<ObjectWritable, ObjectWritable>, ImmutableClassesGiraphConfigurable { private MessageCombiner messageCombiner; private ImmutableClassesGiraphConfiguration configuration;
