Repository: giraph Updated Branches: refs/heads/trunk b2c982294 -> 3eec67e4e
GIRAPH-1118 - Giraph-gora and Giraph-rexster test cases fail in release-1.2 Test Plan: mvn clean verify -Phadoop_facebook rm -rf ~/.m2/repository/org/apache/giraph mvn clean install -Phadoop_1 rm -rf ~/.m2/repository/org/apache/giraph mvn clean install -Phadoop_2 Reviewers: maja.kabiljo, majakabiljo, dionysis.logothetis Reviewed By: dionysis.logothetis Differential Revision: https://reviews.facebook.net/D64719 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/3eec67e4 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/3eec67e4 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/3eec67e4 Branch: refs/heads/trunk Commit: 3eec67e4e0bfa38be5ab3d939bcf3550c6113a3e Parents: b2c9822 Author: Sergey Edunov <edu...@fb.com> Authored: Thu Oct 6 11:13:49 2016 -0700 Committer: Sergey Edunov <edu...@fb.com> Committed: Thu Oct 6 11:13:49 2016 -0700 ---------------------------------------------------------------------- giraph-dist/pom.xml | 10 ---------- pom.xml | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/3eec67e4/giraph-dist/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-dist/pom.xml b/giraph-dist/pom.xml index 34978f1..9314420 100644 --- a/giraph-dist/pom.xml +++ b/giraph-dist/pom.xml @@ -113,15 +113,5 @@ <groupId>org.apache.giraph</groupId> <artifactId>giraph-gora</artifactId> </dependency> - <dependency> - <groupId>org.apache.giraph</groupId> - <artifactId>giraph-kibble</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/giraph/blob/3eec67e4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fea5d40..319158b 100644 --- a/pom.xml +++ b/pom.xml @@ -1087,6 +1087,10 @@ under the License. <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> </exclusions> </dependency> </dependencies>
