aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorMartin Weindel <martin.weindel@gmail.com>2013-10-05 21:41:09 +0200
committerMartin Weindel <martin.weindel@gmail.com>2013-10-05 21:41:09 +0200
commit9b0c9c893d1b7d593b98c7117081051977fc81f3 (patch)
treec0d0401a74ad55df16e538e63b2c671d45d6a801 /pom.xml
parent3fe12cc2cab45e08e80f6cc355dc935c3473757a (diff)
downloadspark-9b0c9c893d1b7d593b98c7117081051977fc81f3.tar.gz
spark-9b0c9c893d1b7d593b98c7117081051977fc81f3.tar.bz2
spark-9b0c9c893d1b7d593b98c7117081051977fc81f3.zip
scala 2.10 requires Java 1.6,
using Scala 2.10.3, resolved maven-scala-plugin warning
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index b9e872255e..e9f90135dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>