TINKERPOP-1535 Bump to 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/ae4d8af2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae4d8af2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae4d8af2 Branch: refs/heads/TINKERPOP-1535 Commit: ae4d8af2d45613d7b4666bca0e8f33f11f7d977a Parents: 4113f0e Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Mar 2 17:29:17 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Mar 2 17:29:17 2018 -0500 ---------------------------------------------------------------------- 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/ae4d8af2/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 46b0e5b..7be4311 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -25,6 +25,7 @@ NEED AND IMAGE This release also includes changes from <<release-3-3-2, 3.3.2>>. +* Bumped to support Giraph 1.2.0. == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae4d8af2/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index 8cf3f5b..56ad1d4 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/ae4d8af2/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;
