diff options
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 40 |
1 files changed, 24 insertions, 16 deletions
@@ -75,9 +75,17 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.5</java.version> +<<<<<<< HEAD + <scala.version>2.10</scala.version> + <mesos.version>0.9.0-incubating</mesos.version> + <akka.version>2.1.4</akka.version> + <spray.version>1.1-M7</spray.version> + <spray.json.version>1.2.3</spray.json.version> +======= <scala.version>2.9.3</scala.version> <mesos.version>0.12.1</mesos.version> <akka.version>2.0.5</akka.version> +>>>>>>> master <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> @@ -89,9 +97,9 @@ <repositories> <repository> - <id>jboss-repo</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/nexus/content/repositories/releases/</url> + <id>typesafe-repo</id> + <name>Typesafe Repository</name> + <url>http://repo.typesafe.com/typesafe/releases/</url> <releases> <enabled>true</enabled> </releases> @@ -100,9 +108,9 @@ </snapshots> </repository> <repository> - <id>cloudera-repo</id> - <name>Cloudera Repository</name> - <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url> + <id>jboss-repo</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/nexus/content/repositories/releases/</url> <releases> <enabled>true</enabled> </releases> @@ -221,18 +229,18 @@ <version>0.3.1</version> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-actor</artifactId> - <version>${akka.version}</version> + <groupId>org.scala-lang</groupId> + <artifactId>scala-actors</artifactId> + <version>2.10.0</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-remote</artifactId> + <artifactId>akka-remote_${scala.version}</artifactId> <version>${akka.version}</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> - <artifactId>akka-slf4j</artifactId> + <artifactId>akka-slf4j_${scala.version}</artifactId> <version>${akka.version}</version> </dependency> <dependency> @@ -247,7 +255,7 @@ </dependency> <dependency> <groupId>com.github.scala-incubator.io</groupId> - <artifactId>scala-io-file_2.9.2</artifactId> + <artifactId>scala-io-file_2.10</artifactId> <version>0.4.1</version> </dependency> <dependency> @@ -268,8 +276,8 @@ </dependency> <dependency> <groupId>net.liftweb</groupId> - <artifactId>lift-json_2.9.2</artifactId> - <version>2.5</version> + <artifactId>lift-json_2.10</artifactId> + <version>2.5.1</version> </dependency> <dependency> <groupId>com.codahale.metrics</groupId> @@ -289,12 +297,12 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> - <version>${scala.version}</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> |