You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/04/25 06:51:55 UTC

git commit: Fix [SPARK-1078]: Remove the Unnecessary lift-json dependency

Repository: spark
Updated Branches:
  refs/heads/master 06e82d94b -> 095b51825


Fix [SPARK-1078]: Remove the Unnecessary lift-json dependency

Remove the Unnecessary lift-json dependency from pom.xml

Author: Sandeep <sa...@techaddict.me>

Closes #536 from techaddict/FIX-SPARK-1078 and squashes the following commits:

bd0fd1d [Sandeep] Fix [SPARK-1078]: Replace lift-json with json4s-jackson. Remove the Unnecessary lift-json dependency from pom.xml


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/095b5182
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/095b5182
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/095b5182

Branch: refs/heads/master
Commit: 095b5182536a43e2ae738be93294ee5215d86581
Parents: 06e82d9
Author: Sandeep <sa...@techaddict.me>
Authored: Thu Apr 24 21:51:52 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Thu Apr 24 21:51:52 2014 -0700

----------------------------------------------------------------------
 pom.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/095b5182/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ff18af..e292775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,20 +381,6 @@
         <version>10.4.2.0</version>
       </dependency>
       <dependency>
-        <groupId>net.liftweb</groupId>
-        <artifactId>lift-json_${scala.binary.version}</artifactId>
-        <version>2.5.1</version>
-        <!-- see also exclusion for json4s; this is necessary since it depends on
-             scala-library and scalap 2.10.0, but we use 2.10.4, and only override
-             scala-library -->
-        <exclusions>
-          <exclusion>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scalap</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
         <groupId>com.codahale.metrics</groupId>
         <artifactId>metrics-core</artifactId>
         <version>${codahale.metrics.version}</version>
@@ -851,7 +837,7 @@
       </modules>
 
     </profile>
-    
+
    <!-- Build without Hadoop dependencies that are included in some runtime environments. -->
     <profile>
       <id>hadoop-provided</id>
@@ -896,6 +882,6 @@
         </dependency>
       </dependencies>
     </profile>
-    
+
   </profiles>
 </project>