diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 8527b28f8e..66701685ed 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -595,13 +595,13 @@ object Dependencies {
 
 object Dependency {
   // Compile
-  val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.0" exclude("org.slf4j", "slf4j-api")      // ApacheV2
-  val config        = "com.typesafe"                % "config"                       % "0.5.0"         // ApacheV2
+  val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
+  val config        = "com.typesafe"                % "config"                       % "0.5.0"       // ApacheV2
   val netty         = "io.netty"                    % "netty"                        % "3.5.3.Final" // ApacheV2
   val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
-  val scalaStm      = "org.scala-tools"            %% "scala-stm"                    % "0.6"         // Modified BSD (Scala)
+  val scalaStm      = "org.scala-tools"             % "scala-stm"                    % "0.6" cross CrossVersion.full // Modified BSD (Scala)
   val slf4jApi      = "org.slf4j"                   % "slf4j-api"                    % "1.6.4"       // MIT
-  val zeroMQClient  = "org.zeromq"                 %% "zeromq-scala-binding"         % "0.0.6"       // ApacheV2
+  val zeroMQClient  = "org.zeromq"                  % "zeromq-scala-binding"         % "0.0.6" cross CrossVersion.full // ApacheV2
   val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"              % "1.2.2a"      // ApacheV2
   val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint"   % "0.3.2"       // ApacheV2
   val osgiCore      = "org.osgi"                    % "org.osgi.core"                % "4.2.0"       // ApacheV2
@@ -614,8 +614,8 @@ object Dependency {
     val junit       = "junit"                       % "junit"                        % "4.10"             % "test" // Common Public License 1.0
     val logback     = "ch.qos.logback"              % "logback-classic"              % "1.0.4"            % "test" // EPL 1.0 / LGPL 2.1
     val mockito     = "org.mockito"                 % "mockito-all"                  % "1.8.1"            % "test" // MIT
-    val scalatest   = "org.scalatest"              %% "scalatest"                    % "1.9-2.10.0-M6-B2" % "test" // ApacheV2
-    val scalacheck  = "org.scalacheck"             %% "scalacheck"                   % "1.10.0"           % "test" // New BSD
+    val scalatest   = "org.scalatest"               % "scalatest"                    % "1.9-2.10.0-M6-B2" % "test" cross CrossVersion.full // ApacheV2
+    val scalacheck  = "org.scalacheck"              % "scalacheck"                   % "1.10.0"           % "test" cross CrossVersion.full // New BSD
     val ariesProxy  = "org.apache.aries.proxy"      % "org.apache.aries.proxy.impl"  % "0.3"              % "test" // ApacheV2
     val pojosr      = "com.googlecode.pojosr"       % "de.kalpatec.pojosr.framework" % "0.1.4"            % "test" // ApacheV2
     val tinybundles = "org.ops4j.pax.tinybundles"   % "tinybundles"                  % "1.0.0"            % "test" // ApacheV2
diff --git a/project/build.properties b/project/build.properties
index d4287112c6..a8c2f849be 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.0