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 /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 'pom.xml')
-rw-r--r-- | pom.xml | 72 |
1 files changed, 19 insertions, 53 deletions
@@ -98,17 +98,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,31 +208,6 @@ <version>1.2.0</version> </dependency> <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-can</artifactId> - <version>${spray.version}</version> - </dependency> - <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-routing</artifactId> - <version>${spray.version}</version> - </dependency> - <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-io</artifactId> - <version>${spray.version}</version> - </dependency> - <dependency> - <groupId>io.spray</groupId> - <artifactId>spray-json_${scala.version}</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.10</artifactId> <version>0.4.1</version> @@ -264,7 +228,11 @@ <version>10.4.2.0</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>net.liftweb</groupId> + <artifactId>lift-json_2.10</artifactId> + <version>2.5.1</version> + </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> @@ -275,6 +243,16 @@ <artifactId>jline</artifactId> <version>2.10.0</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> @@ -341,18 +319,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> @@ -558,12 +524,12 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.7.1.cloudera.2</version> + <version>1.7.4</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc</artifactId> - <version>1.7.1.cloudera.2</version> + <version>1.7.4</version> <exclusions> <exclusion> <groupId>org.jboss.netty</groupId> @@ -625,12 +591,12 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.7.1.cloudera.2</version> + <version>1.7.4</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc</artifactId> - <version>1.7.1.cloudera.2</version> + <version>1.7.4</version> </dependency> </dependencies> </dependencyManagement> |