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 /pom.xml | |
| 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 'pom.xml')
| -rw-r--r-- | pom.xml | 37 |
1 files changed, 4 insertions, 33 deletions
@@ -310,6 +310,9 @@ <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.3, and only override + scala-library --> <exclusions> <exclusion> <groupId>org.scala-lang</groupId> @@ -374,7 +377,7 @@ <version>3.1</version> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.8.5</version> @@ -417,14 +420,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> @@ -448,14 +443,6 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -471,14 +458,6 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> @@ -495,14 +474,6 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.sisu.inject</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> </dependencies> |