diff options
| author | Martin Weindel <martin.weindel@gmail.com> | 2013-10-05 21:41:09 +0200 |
|---|---|---|
| committer | Martin Weindel <martin.weindel@gmail.com> | 2013-10-05 21:41:09 +0200 |
| commit | 9b0c9c893d1b7d593b98c7117081051977fc81f3 (patch) | |
| tree | c0d0401a74ad55df16e538e63b2c671d45d6a801 | |
| parent | 3fe12cc2cab45e08e80f6cc355dc935c3473757a (diff) | |
| download | spark-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
| -rw-r--r-- | pom.xml | 12 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 6 |
2 files changed, 12 insertions, 6 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> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b5e65a1856..5d4250a53b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -34,8 +34,8 @@ object SparkBuild extends Build { val HBASE_VERSION = "0.94.6" // Target JVM version - val SCALAC_JVM_VERSION = "jvm-1.5" - val JAVAC_JVM_VERSION = "1.5" + val SCALAC_JVM_VERSION = "jvm-1.6" + val JAVAC_JVM_VERSION = "1.6" lazy val root = Project("root", file("."), settings = rootSettings) aggregate(allProjects: _*) @@ -80,7 +80,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", version := "0.8.0-SNAPSHOT", - scalaVersion := "2.10.2", + scalaVersion := "2.10.3", scalacOptions := Seq("-unchecked", "-optimize", "-deprecation", "-target:" + SCALAC_JVM_VERSION), javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, |