From 315e1838b4f20550e7e6ee435191e794ed3f212e Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 22 Dec 2012 13:27:22 +0100 Subject: [PATCH] Update version for release 2.1.0 --- 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-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 +- 9 files changed, 12 insertions(+), 12 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 6f35f8d18b7..3b16759017e 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.1.0") + settings.ConfigVersion must equal("2.1.0") 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 839a9b614d7..79362a4a853 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.1.0" # 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 8a87a3b7cd4..085b1e34905 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.1.0" 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 d15368f6968..a27f44859b0 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.1.0 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 4abcd7e7f81..ee83c7b3c3c 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.1.0/ diff --git a/akka-samples/akka-sample-cluster/pom.xml b/akka-samples/akka-sample-cluster/pom.xml index e01518726db..ac9119baa63 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.1.0 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 c5d122a7db2..2495493585f 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.1.0" val ScalaVersion = "2.10.0" lazy val HelloKernel = Project( @@ -49,7 +49,7 @@ object Dependencies { object Dependency { // Versions object V { - val Akka = "2.1-SNAPSHOT" + val Akka = "2.1.0" } 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 16303790bff..d3989f88d04 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.1-SNAPSHOT") +addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1.0") diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 0376a93ea0b..4248ae2fd52 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.1.0", // Also change ScalaVersion in akka-sbt-plugin/sample/project/Build.scala scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0") )