commit 0cab55b4ef4b3e0d287a68c1c16f624dc8f6319c
author Sergey Edunov <edunov@fb.com> Thu Oct 06 11:13:49 2016 -0700
committer Sergey Edunov <edunov@fb.com> Thu Oct 06 11:14:37 2016 -0700
tree 088fafd53d197e640a48136e34ed1479bcb748be
parent 7ea61447fc4839106a86bf889a9853899708bbc7

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

giraph-dist/pom.xml

diff --git a/giraph-dist/pom.xml b/giraph-dist/pom.xml
index b9d57ce..4ceecf4 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>

pom.xml

diff --git a/pom.xml b/pom.xml
index 458861f..fdab2bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1087,6 +1087,10 @@
               <groupId>tomcat</groupId>
               <artifactId>jasper-runtime</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>com.sun.jersey</groupId>
+              <artifactId>jersey-json</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
       </dependencies>