You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ed...@apache.org on 2016/10/06 18:21:43 UTC

git commit: updated refs/heads/release-1.2 to 0cab55b

Repository: giraph
Updated Branches:
  refs/heads/release-1.2 7ea61447f -> 0cab55b4e


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/0cab55b4
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/0cab55b4
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/0cab55b4

Branch: refs/heads/release-1.2
Commit: 0cab55b4ef4b3e0d287a68c1c16f624dc8f6319c
Parents: 7ea6144
Author: Sergey Edunov <ed...@fb.com>
Authored: Thu Oct 6 11:13:49 2016 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Thu Oct 6 11:14:37 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/0cab55b4/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>

http://git-wip-us.apache.org/repos/asf/giraph/blob/0cab55b4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 458861f..fdab2bb 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>