diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -112,7 +112,7 @@ <mesos.version>0.13.0</mesos.version> <akka.group>org.spark-project.akka</akka.group> <akka.version>2.2.3-shaded-protobuf</akka.version> - <slf4j.version>1.7.2</slf4j.version> + <slf4j.version>1.7.5</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> <protobuf.version>2.4.1</protobuf.version> @@ -186,6 +186,17 @@ <version>${slf4j.version}</version> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <!-- <scope>runtime</scope> --> <!-- more correct, but scalac 2.10.3 doesn't like it --> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> <groupId>com.ning</groupId> <artifactId>compress-lzf</artifactId> <version>1.0.0</version> @@ -347,23 +358,12 @@ <version>${scala.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <version>1.9.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.8.5</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> @@ -424,6 +424,10 @@ <groupId>org.sonatype.sisu.inject</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |