diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-09 10:32:42 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-09 10:32:42 -0700 |
| commit | 7d50f9f87baeb1f4b8d77d669d25649b97dd1d57 (patch) | |
| tree | 7c5c0602a36fe17feff8d0bb1db6c6f30d756199 /pom.xml | |
| parent | 3fe12cc2cab45e08e80f6cc355dc935c3473757a (diff) | |
| parent | e09f4a9601b18921c309903737d309eab5c6d891 (diff) | |
| download | spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.gz spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.bz2 spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.zip | |
Merge pull request #35 from MartinWeindel/scala-2.10
Fixing inconsistencies and warnings on Scala 2.10 branch
- scala 2.10 requires Java 1.6
- using newest Scala release: 2.10.3
- resolved maven-scala-plugin warning
- fixed various compiler warnings
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -75,10 +75,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.5</java.version> + <java.version>1.6</java.version> <scala-short.version>2.10</scala-short.version> - <scala.version>2.10.2</scala.version> + <scala.version>2.10.3</scala.version> <mesos.version>0.13.0</mesos.version> <akka.version>2.2.1</akka.version> <slf4j.version>1.7.2</slf4j.version> @@ -257,7 +257,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.0.0.Beta2</version> + <version>4.0.0.CR1</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -269,6 +269,12 @@ <groupId>net.liftweb</groupId> <artifactId>lift-json_${scala-short.version}</artifactId> <version>2.5.1</version> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scalap</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.codahale.metrics</groupId> |