aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-07-08 23:24:23 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-07-08 23:24:23 -0700
commit7dcda9ae74818f17b57448acab8bd1dc40d78c19 (patch)
tree4ceddff8fc827edfc32b8697c54e43f3ab0bacfa
parent638927b78e5b67e71d0c7360a2f36841d13dc107 (diff)
parent0b39d66f3f815f2d406d83a41db0f46d097baaa7 (diff)
downloadspark-7dcda9ae74818f17b57448acab8bd1dc40d78c19.tar.gz
spark-7dcda9ae74818f17b57448acab8bd1dc40d78c19.tar.bz2
spark-7dcda9ae74818f17b57448acab8bd1dc40d78c19.zip
Merge pull request #688 from markhamstra/scalaDependencies
Fixed SPARK-795 with explicit dependencies
-rw-r--r--core/pom.xml8
-rw-r--r--examples/pom.xml4
-rw-r--r--pom.xml10
-rw-r--r--streaming/pom.xml4
4 files changed, 26 insertions, 0 deletions
diff --git a/core/pom.xml b/core/pom.xml
index 5edafb3706..dbb2da9a9c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -56,6 +56,14 @@
<artifactId>akka-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scalap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_2.9.2</artifactId>
</dependency>
diff --git a/examples/pom.xml b/examples/pom.xml
index 78ec58729b..1976765c3d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -16,6 +16,10 @@
<dependencies>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 017c242464..63dd80b5fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,6 +241,16 @@
<artifactId>jline</artifactId>
<version>${scala.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scalap</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 4dc9a19d51..2fb5bbdeb5 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -59,6 +59,10 @@
<version>3.0.3</version>
</dependency>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-zeromq</artifactId>
<version>2.0.3</version>