diff options
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> |