From 6c89f640b6a5a9a6a58b62e1560f6d551e270724 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Wed, 17 Oct 2012 01:00:57 +0200 Subject: [PATCH] Bumping the version of Akka master to 2.2-SNAPSHOT --- akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala | 4 ++-- akka-actor/src/main/resources/reference.conf | 2 +- akka-actor/src/main/scala/akka/actor/ActorSystem.scala | 2 +- akka-docs/rst/modules/camel.rst | 2 +- akka-kernel/src/main/dist/README | 2 +- akka-kernel/src/main/dist/config/application.conf | 2 +- akka-samples/akka-sample-cluster/pom.xml | 4 ++-- akka-sbt-plugin/sample/project/Build.scala | 4 ++-- akka-sbt-plugin/sample/project/plugins.sbt | 2 +- project/AkkaBuild.scala | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala index 67ed31509d..1aa168b924 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -24,8 +24,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin { import config._ - getString("akka.version") must equal("2.1-SNAPSHOT") - settings.ConfigVersion must equal("2.1-SNAPSHOT") + getString("akka.version") must equal("2.2-SNAPSHOT") + settings.ConfigVersion must equal("2.2-SNAPSHOT") getBoolean("akka.daemonic") must equal(false) getBoolean("akka.actor.serialize-messages") must equal(false) diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index 839a9b614d..aeee89a65f 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -7,7 +7,7 @@ akka { # Akka version, checked against the runtime version of Akka. - version = "2.1-SNAPSHOT" + version = "2.2-SNAPSHOT" # Home directory of Akka, modules in the deploy directory will be loaded home = "" diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 5f89c5166e..a9528a57aa 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -23,7 +23,7 @@ import util.{ Failure, Success } object ActorSystem { - val Version: String = "2.1-SNAPSHOT" + val Version: String = "2.2-SNAPSHOT" val EnvHome: Option[String] = System.getenv("AKKA_HOME") match { case null | "" | "." ⇒ None diff --git a/akka-docs/rst/modules/camel.rst b/akka-docs/rst/modules/camel.rst index 68686ce586..f5ca672afa 100644 --- a/akka-docs/rst/modules/camel.rst +++ b/akka-docs/rst/modules/camel.rst @@ -6,7 +6,7 @@ ####### .. note:: - The Akka Camel module has not been migrated to Akka 2.1-SNAPSHOT yet. + The Akka Camel module has not been migrated to Akka 2.2-SNAPSHOT yet. It might not make it into Akka 2.0 final but will then hopefully be re-introduce in an upcoming release. It might also be backported to diff --git a/akka-kernel/src/main/dist/README b/akka-kernel/src/main/dist/README index d15368f696..3b25f979a6 100644 --- a/akka-kernel/src/main/dist/README +++ b/akka-kernel/src/main/dist/README @@ -2,7 +2,7 @@ Akka ==== -This is the Akka 2.1-SNAPSHOT download. +This is the Akka 2.2-SNAPSHOT download. Included are all libraries, documentation, and sources for Akka. diff --git a/akka-kernel/src/main/dist/config/application.conf b/akka-kernel/src/main/dist/config/application.conf index 4abcd7e7f8..d3a3ea5725 100644 --- a/akka-kernel/src/main/dist/config/application.conf +++ b/akka-kernel/src/main/dist/config/application.conf @@ -1,3 +1,3 @@ # In this file you can override any option defined in the 'reference.conf' files. # Copy in all or parts of the 'reference.conf' files and modify as you please. -# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.1-SNAPSHOT/ +# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.2-SNAPSHOT/ diff --git a/akka-samples/akka-sample-cluster/pom.xml b/akka-samples/akka-sample-cluster/pom.xml index e01518726d..78cdd9ca2b 100644 --- a/akka-samples/akka-sample-cluster/pom.xml +++ b/akka-samples/akka-sample-cluster/pom.xml @@ -7,7 +7,7 @@ com.typesafe.akka akka-sample-cluster-experimental-japi - 2.1-SNAPSHOT + 2.2-SNAPSHOT jar UTF-8 @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala index b212548f6b..b7c5122da3 100644 --- a/akka-sbt-plugin/sample/project/Build.scala +++ b/akka-sbt-plugin/sample/project/Build.scala @@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions} object HelloKernelBuild extends Build { val Organization = "akka.sample" - val Version = "2.1-SNAPSHOT" + val Version = "2.2-SNAPSHOT" val ScalaVersion = "2.10.0-M6" lazy val HelloKernel = Project( @@ -49,7 +49,7 @@ object Dependencies { object Dependency { // Versions object V { - val Akka = "2.1-SNAPSHOT" + val Akka = "2.2-SNAPSHOT" } val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka diff --git a/akka-sbt-plugin/sample/project/plugins.sbt b/akka-sbt-plugin/sample/project/plugins.sbt index 3f814e328e..b34eb00adb 100644 --- a/akka-sbt-plugin/sample/project/plugins.sbt +++ b/akka-sbt-plugin/sample/project/plugins.sbt @@ -1,3 +1,3 @@ resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-SNAPSHOT") +addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT") diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 5a1758faf1..d126c450fa 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -28,7 +28,7 @@ object AkkaBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", - version := "2.1-SNAPSHOT", + version := "2.2-SNAPSHOT", // FIXME: use 2.10.0 for final scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0-RC1") )