Repository: spark Updated Branches: refs/heads/branch-1.0 db698414f -> 496b9ae18
Fix [SPARK-1078]: Remove the Unnecessary lift-json dependency Remove the Unnecessary lift-json dependency from pom.xml Author: Sandeep <sand...@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 (cherry picked from commit 095b5182536a43e2ae738be93294ee5215d86581) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/496b9ae1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/496b9ae1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/496b9ae1 Branch: refs/heads/branch-1.0 Commit: 496b9ae180f1d9c6aac0680e953f2250e03be808 Parents: db69841 Author: Sandeep <sand...@techaddict.me> Authored: Thu Apr 24 21:51:52 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Thu Apr 24 21:51:58 2014 -0700 ---------------------------------------------------------------------- pom.xml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/496b9ae1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1ad1da3..7098219 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>
