diff options
| author | Sean Owen <sowen@cloudera.com> | 2014-03-02 14:27:53 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-03-02 14:27:53 -0800 |
| commit | fd31adbf27d824f00f62646e13c23f632d1b77d3 (patch) | |
| tree | c0a03717075b62488f5720a5c49fe4d8cdd3fba6 /core | |
| parent | 353ac6b4fa8f0740a7faabc1309022420c7b52fc (diff) | |
| download | spark-fd31adbf27d824f00f62646e13c23f632d1b77d3.tar.gz spark-fd31adbf27d824f00f62646e13c23f632d1b77d3.tar.bz2 spark-fd31adbf27d824f00f62646e13c23f632d1b77d3.zip | |
SPARK-1084.2 (resubmitted)
(Ported from https://github.com/apache/incubator-spark/pull/650 )
This adds one more change though, to fix the scala version warning introduced by json4s recently.
Author: Sean Owen <sowen@cloudera.com>
Closes #32 from srowen/SPARK-1084.2 and squashes the following commits:
9240abd [Sean Owen] Avoid scala version conflict in scalap induced by json4s dependency
1561cec [Sean Owen] Remove "exclude *" dependencies that are causing Maven warnings, and that are apparently unneeded anyway
Diffstat (limited to 'core')
| -rw-r--r-- | core/pom.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/pom.xml b/core/pom.xml index 6626d7c1b9..2afd250825 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -125,6 +125,15 @@ <groupId>org.json4s</groupId> <artifactId>json4s-jackson_${scala.binary.version}</artifactId> <version>3.2.6</version> + <!-- see also exclusion for lift-json; this is necessary since it depends on + scala-library and scalap 2.10.0, but we use 2.10.3, and only override + scala-library --> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scalap</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> |