diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-12 14:49:16 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-12 14:49:16 +0530 |
| commit | e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd (patch) | |
| tree | 2dcdbfa2daf5836357def8744447043ed2181c4e /core/pom.xml | |
| parent | 6e6d94ffdfa885432408d6996bad7df2a641748a (diff) | |
| parent | bc19477efbe9ad18a27516a771dd14c497368516 (diff) | |
| download | spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.tar.gz spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.tar.bz2 spark-e86d5dbaad9de3c04fe080b8fb96a7ebbd20c7cd.zip | |
Merge branch 'master' into master-merge
Conflicts:
README.md
core/pom.xml
core/src/main/scala/spark/deploy/JsonProtocol.scala
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
core/src/main/scala/spark/deploy/master/Master.scala
core/src/main/scala/spark/deploy/master/MasterWebUI.scala
core/src/main/scala/spark/deploy/worker/Worker.scala
core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
core/src/main/scala/spark/storage/BlockManagerUI.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
project/SparkBuild.scala
streaming/src/main/scala/spark/streaming/receivers/ActorReceiver.scala
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/core/pom.xml b/core/pom.xml index 385663a638..a55f58a9db 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,32 +56,24 @@ <artifactId>akka-slf4j_${scala.version}</artifactId> </dependency> <dependency> - <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil</artifactId> - </dependency> - <dependency> - <groupId>colt</groupId> - <artifactId>colt</artifactId> - </dependency> - <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-can</artifactId> + <groupId>org.scala-lang</groupId> + <artifactId>scalap</artifactId> </dependency> <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-routing</artifactId> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> </dependency> <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-io</artifactId> + <groupId>net.liftweb</groupId> + <artifactId>lift-json_2.10</artifactId> </dependency> <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-json_${scala.version}</artifactId> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil</artifactId> </dependency> <dependency> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-api</artifactId> + <groupId>colt</groupId> + <artifactId>colt</artifactId> </dependency> <dependency> <groupId>com.github.scala-incubator.io</groupId> @@ -175,10 +167,6 @@ </environmentVariables> </configuration> </plugin> - <plugin> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-maven-plugin</artifactId> - </plugin> </plugins> </build> |