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 017daf6d8d..5a6b6892de 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.2-SNAPSHOT") - settings.ConfigVersion must equal("2.2-SNAPSHOT") + getString("akka.version") must equal("2.3-SNAPSHOT") + settings.ConfigVersion must equal("2.3-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 5c459059e4..6351083101 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.2-SNAPSHOT" + version = "2.3-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 b90f363e34..92afd9f7f7 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 scala.util.control.{ NonFatal, ControlThrowable } object ActorSystem { - val Version: String = "2.2-SNAPSHOT" + val Version: String = "2.3-SNAPSHOT" val EnvHome: Option[String] = System.getenv("AKKA_HOME") match { case null | "" | "." ⇒ None diff --git a/akka-kernel/src/main/dist/README b/akka-kernel/src/main/dist/README index 1aec7d22a9..940e2b4f26 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.2-SNAPSHOT download. +This is the Akka 2.3-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 d3a3ea5725..c9daa2549e 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.2-SNAPSHOT/ +# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.3-SNAPSHOT/ diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml index 66d884cc68..ea69b7667d 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 2.2-SNAPSHOT + 2.3-SNAPSHOT 2.3.0 ${karaf.version} 3.6.2.Final diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala index 944c04324b..52582bcb12 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.2-SNAPSHOT" + val Version = "2.3-SNAPSHOT" val ScalaVersion = "2.10.2" lazy val HelloKernel = Project( @@ -47,7 +47,7 @@ object Dependencies { object Dependency { // Versions object V { - val Akka = "2.2-SNAPSHOT" + val Akka = "2.3-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 6200abdd63..906be3131c 100644 --- a/akka-sbt-plugin/sample/project/plugins.sbt +++ b/akka-sbt-plugin/sample/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT") +addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.3-SNAPSHOT") diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 839e97fe51..75732f5f6c 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -40,7 +40,7 @@ object AkkaBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", - version := "2.2-SNAPSHOT", + version := "2.3-SNAPSHOT", // Also change ScalaVersion in akka-sbt-plugin/sample/project/Build.scala scalaVersion := requestedScalaVersion, scalaBinaryVersion <<= (scalaVersion, scalaBinaryVersion)((v, bv) => System.getProperty("akka.scalaBinaryVersion", if (v contains "-") v else bv))