diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-14 20:04:24 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-14 20:04:24 -0700 |
| commit | 1044a95c9fa10292162322d74542e36384f68880 (patch) | |
| tree | 52106d84b4804a4c4c8a28cf534dc73914a017f1 | |
| parent | 96c895f65347f7a0d793d6093ecc32aa1a1e26b7 (diff) | |
| parent | 6f28067f8d2fbb371b3614ff7712aa82278dcb11 (diff) | |
| download | spark-1044a95c9fa10292162322d74542e36384f68880.tar.gz spark-1044a95c9fa10292162322d74542e36384f68880.tar.bz2 spark-1044a95c9fa10292162322d74542e36384f68880.zip | |
Merge pull request #652 from ScrapCodes/scala-2.10
Fixed maven build without netty fix
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | repl/pom.xml | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -53,7 +53,7 @@ <java.version>1.5</java.version> <scala.version>2.10</scala.version> <mesos.version>0.9.0-incubating</mesos.version> - <akka.version>2.1.2</akka.version> + <akka.version>2.1.4</akka.version> <spray.version>1.1-M7</spray.version> <spray.json.version>1.2.3</spray.json.version> <slf4j.version>1.6.1</slf4j.version> @@ -265,12 +265,12 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> - <version>${scala.version}</version> + <version>2.10.0</version> </dependency> <dependency> diff --git a/repl/pom.xml b/repl/pom.xml index 0b5e400c3d..891b05fb8f 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -27,10 +27,12 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.slf4j</groupId> |