diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-06 15:51:41 -0700 |
| commit | 1ffadb2d9e87169ccc406cd34dab6bd7beda70f1 (patch) | |
| tree | cb5439f40df3865ec71d285700e377d9d5822c7d /pom.xml | |
| parent | 94871e4703d8566359a405da58c60f411b14857a (diff) | |
| parent | 37abe84212c6dad6fb87a3b47666d6a3c14c1f66 (diff) | |
| download | spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.gz spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.tar.bz2 spark-1ffadb2d9e87169ccc406cd34dab6bd7beda70f1.zip | |
Merge remote-tracking branch 'pwendell/ui-updates'
Conflicts:
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/util/AkkaUtils.scala
pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 51 |
1 files changed, 5 insertions, 46 deletions
@@ -54,8 +54,6 @@ <scala.version>2.9.3</scala.version> <mesos.version>0.9.0-incubating</mesos.version> <akka.version>2.0.3</akka.version> - <spray.version>1.0-M2.1</spray.version> - <spray.json.version>1.1.1</spray.json.version> <slf4j.version>1.7.2</slf4j.version> <cdh.version>4.1.2</cdh.version> <log4j.version>1.2.17</log4j.version> @@ -98,17 +96,6 @@ <enabled>false</enabled> </snapshots> </repository> - <repository> - <id>spray-repo</id> - <name>Spray Repository</name> - <url>http://repo.spray.cc/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> </repositories> <pluginRepositories> <pluginRepository> @@ -219,26 +206,6 @@ <version>1.2.0</version> </dependency> <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-can</artifactId> - <version>${spray.version}</version> - </dependency> - <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-server</artifactId> - <version>${spray.version}</version> - </dependency> - <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-json_2.9.2</artifactId> - <version>${spray.json.version}</version> - </dependency> - <dependency> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-api</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> <groupId>com.github.scala-incubator.io</groupId> <artifactId>scala-io-file_2.9.2</artifactId> <version>0.4.1</version> @@ -259,7 +226,11 @@ <version>10.4.2.0</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>net.liftweb</groupId> + <artifactId>lift-json_2.9.2</artifactId> + <version>2.5</version> + </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> @@ -336,18 +307,6 @@ <version>1.7</version> </plugin> <plugin> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-maven-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> <version>3.1.0</version> |