aboutsummaryrefslogtreecommitdiff
path: root/core/pom.xml
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2013-09-26 10:48:24 +0530
committerPrashant Sharma <prashant.s@imaginea.com>2013-09-26 10:48:24 +0530
commit7ff4c2d399e1497966689cbe13edf2cd2a9a29b1 (patch)
tree6542b94fe87970b52dcea84352482698ae5ed738 /core/pom.xml
parent276c37a51c9a6188dbbe02754935540ace338dd1 (diff)
downloadspark-7ff4c2d399e1497966689cbe13edf2cd2a9a29b1.tar.gz
spark-7ff4c2d399e1497966689cbe13edf2cd2a9a29b1.tar.bz2
spark-7ff4c2d399e1497966689cbe13edf2cd2a9a29b1.zip
fixed maven build for scala 2.10
Diffstat (limited to 'core/pom.xml')
-rw-r--r--core/pom.xml31
1 files changed, 14 insertions, 17 deletions
diff --git a/core/pom.xml b/core/pom.xml
index d42c2ee2fd..8d9f0e386f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
- <artifactId>chill_2.10</artifactId>
+ <artifactId>chill_${scala-short.version}</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
@@ -92,20 +92,12 @@
<version>0.3.1</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-actors</artifactId>
- </dependency>
- <dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-remote_${scala.version}</artifactId>
+ <artifactId>akka-remote_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_${scala.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scalap</artifactId>
+ <artifactId>akka-slf4j_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -113,7 +105,7 @@
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
- <artifactId>lift-json_2.10</artifactId>
+ <artifactId>lift-json_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
@@ -125,7 +117,7 @@
</dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
- <artifactId>scala-io-file_2.10</artifactId>
+ <artifactId>scala-io-file_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mesos</groupId>
@@ -161,13 +153,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.version}</artifactId>
+ <artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
- <artifactId>scalacheck_${scala.version}</artifactId>
+ <artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -187,8 +184,8 @@
</dependency>
</dependencies>
<build>
- <outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
- <testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
+ <outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
+ <testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>