Repository: tinkerpop Updated Branches: refs/heads/master 7b84aff70 -> 03cfe0308
Added exclusions for jackson that were conflicting with spark 2.0 CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/03cfe030 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/03cfe030 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/03cfe030 Branch: refs/heads/master Commit: 03cfe0308e8d82bc654bd9d8975524f278a338dd Parents: 7b84aff Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Feb 3 12:33:21 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Feb 3 12:33:21 2017 -0500 ---------------------------------------------------------------------- giraph-gremlin/pom.xml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/03cfe030/giraph-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml index 9a21f36..ed58572 100644 --- a/giraph-gremlin/pom.xml +++ b/giraph-gremlin/pom.xml @@ -25,16 +25,16 @@ limitations under the License. </parent> <artifactId>giraph-gremlin</artifactId> <name>Apache TinkerPop :: Giraph 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> - </dependencies> - </dependencyManagement> + <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> + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.apache.tinkerpop</groupId> @@ -89,6 +89,11 @@ limitations under the License. <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </exclusion> + <!-- uses an older version that conflicts with spark 2.0 --> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -129,6 +134,11 @@ limitations under the License. <artifactId>javax.servlet-api</artifactId> <version>3.1.0</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.6.5</version> + </dependency> <!-- TEST --> <dependency> <groupId>org.apache.tinkerpop</groupId>
