diff options
| -rw-r--r-- | core/pom.xml | 24 | ||||
| -rw-r--r-- | pom.xml | 51 |
2 files changed, 9 insertions, 66 deletions
diff --git a/core/pom.xml b/core/pom.xml index 88f0ed70f3..5edafb3706 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,6 +56,10 @@ <artifactId>akka-slf4j</artifactId> </dependency> <dependency> + <groupId>net.liftweb</groupId> + <artifactId>lift-json_2.9.2</artifactId> + </dependency> + <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> </dependency> @@ -64,22 +68,6 @@ <artifactId>colt</artifactId> </dependency> <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-can</artifactId> - </dependency> - <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-server</artifactId> - </dependency> - <dependency> - <groupId>cc.spray</groupId> - <artifactId>spray-json_2.9.2</artifactId> - </dependency> - <dependency> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-api</artifactId> - </dependency> - <dependency> <groupId>com.github.scala-incubator.io</groupId> <artifactId>scala-io-file_2.9.2</artifactId> </dependency> @@ -171,10 +159,6 @@ </environmentVariables> </configuration> </plugin> - <plugin> - <groupId>org.tomdz.twirl</groupId> - <artifactId>twirl-maven-plugin</artifactId> - </plugin> </plugins> </build> @@ -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.6.1</slf4j.version> <cdh.version>4.1.2</cdh.version> <log4j.version>1.2.17</log4j.version> @@ -99,17 +97,6 @@ </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> - <repository> <id>twitter4j-repo</id> <name>Twitter4J Repository</name> <url>http://twitter4j.org/maven2/</url> @@ -230,26 +217,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> @@ -270,7 +237,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> @@ -347,18 +318,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> |