From f0bbb1edf48ea9999e033a60eae36310803b2f38 Mon Sep 17 00:00:00 2001 From: Michael Kober Date: Tue, 25 May 2010 12:17:54 +0200 Subject: [PATCH] fixed merge error --- project/build/AkkaProject.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 9330278f80..26327d9c0c 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -4,7 +4,8 @@ import sbt._ import sbt.CompileOrder._ - +import spde._ + import java.util.jar.Attributes import java.util.jar.Attributes.Name._ import java.io.File @@ -22,7 +23,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { // ------------------------------------------------------------ lazy val deployPath = info.projectPath / "deploy" lazy val distPath = info.projectPath / "dist" - lazy val parentPath = info.projectPath override def compileOptions = super.compileOptions ++ Seq("-deprecation", "-Xmigration", "-Xcheckinit", @@ -171,7 +171,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile" val protobuf = "com.google.protobuf" % "protobuf-java" % "2.2.0" % "compile" val multiverse = "org.multiverse" % "multiverse-alpha" % "0.5" % "compile" - val jgroups = "jgroups" % "jgroups" % "2.8.0.CR7" % "compile" + val jgroups = "jgroups" % "jgroups" % "2.9.0.GA" % "compile" // testing val scalatest = "org.scalatest" % "scalatest" % SCALATEST_VERSION % "test" @@ -217,7 +217,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { } class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { - val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.3" % "compile" + val redis = "com.redis" % "redisclient" % "2.8.0.RC2-1.4-SNAPSHOT" % "compile" override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil }