From ca7aea96a65edd577c3bd36ab1a6e3765a6f6291 Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Wed, 18 May 2011 12:44:37 +1200 Subject: [PATCH] Bump version to 2.0-SNAPSHOT --- akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala | 2 +- akka-actor/src/main/scala/akka/config/Config.scala | 2 +- akka-tutorials/akka-tutorial-first/pom.xml | 4 ++-- akka-tutorials/akka-tutorial-first/project/build.properties | 2 +- .../akka-tutorial-first/project/plugins/Plugins.scala | 2 +- akka-tutorials/akka-tutorial-second/pom.xml | 4 ++-- akka-tutorials/akka-tutorial-second/project/build.properties | 2 +- .../akka-tutorial-second/project/plugins/Plugins.scala | 2 +- config/akka-reference.conf | 2 +- project/build.properties | 2 +- scripts/run_akka.sh | 2 +- 11 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 722e638c2c..916852a7b4 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -18,7 +18,7 @@ class ConfigSpec extends WordSpec with MustMatchers { getList("akka.boot") must equal(Nil) getString("akka.time-unit") must equal(Some("seconds")) - getString("akka.version") must equal(Some("1.2-SNAPSHOT")) + getString("akka.version") must equal(Some("2.0-SNAPSHOT")) getString("akka.actor.default-dispatcher.type") must equal(Some("GlobalExecutorBasedEventDriven")) getInt("akka.actor.default-dispatcher.keep-alive-time") must equal(Some(60)) diff --git a/akka-actor/src/main/scala/akka/config/Config.scala b/akka-actor/src/main/scala/akka/config/Config.scala index eef0c5d8e0..9897a09cd0 100644 --- a/akka-actor/src/main/scala/akka/config/Config.scala +++ b/akka-actor/src/main/scala/akka/config/Config.scala @@ -15,7 +15,7 @@ class ModuleNotAvailableException(message: String, cause: Throwable = null) exte * @author Jonas Bonér */ object Config { - val VERSION = "1.2-SNAPSHOT" + val VERSION = "2.0-SNAPSHOT" val HOME = { val envHome = System.getenv("AKKA_HOME") match { diff --git a/akka-tutorials/akka-tutorial-first/pom.xml b/akka-tutorials/akka-tutorial-first/pom.xml index b3e9f7319c..8e25d972f3 100644 --- a/akka-tutorials/akka-tutorial-first/pom.xml +++ b/akka-tutorials/akka-tutorial-first/pom.xml @@ -8,14 +8,14 @@ akka.tutorial.first.java akka-tutorial-first-java jar - 1.2-SNAPSHOT + 2.0-SNAPSHOT http://akka.io se.scalablesolutions.akka akka-actor - 1.2-SNAPSHOT + 2.0-SNAPSHOT diff --git a/akka-tutorials/akka-tutorial-first/project/build.properties b/akka-tutorials/akka-tutorial-first/project/build.properties index efe6111c40..4981c1c2c3 100644 --- a/akka-tutorials/akka-tutorial-first/project/build.properties +++ b/akka-tutorials/akka-tutorial-first/project/build.properties @@ -1,5 +1,5 @@ project.organization=se.scalablesolutions.akka project.name=akka-tutorial-first -project.version=1.2-SNAPSHOT +project.version=2.0-SNAPSHOT build.scala.versions=2.9.0 sbt.version=0.7.7 diff --git a/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala index aa263a988e..fb121fcd3e 100644 --- a/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala +++ b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala @@ -2,5 +2,5 @@ import sbt._ class Plugins(info: ProjectInfo) extends PluginDefinition(info) { val akkaRepo = "Akka Repo" at "http://akka.io/repository" - val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.2-SNAPSHOT" + val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT" } diff --git a/akka-tutorials/akka-tutorial-second/pom.xml b/akka-tutorials/akka-tutorial-second/pom.xml index cf7c46fd3b..e5793c90cc 100644 --- a/akka-tutorials/akka-tutorial-second/pom.xml +++ b/akka-tutorials/akka-tutorial-second/pom.xml @@ -8,14 +8,14 @@ akka.tutorial.second.java akka-tutorial-second-java jar - 1.2-SNAPSHOT + 2.0-SNAPSHOT http://akka.io se.scalablesolutions.akka akka-actor - 1.2-SNAPSHOT + 2.0-SNAPSHOT diff --git a/akka-tutorials/akka-tutorial-second/project/build.properties b/akka-tutorials/akka-tutorial-second/project/build.properties index 7c84e8368b..fd354dd902 100644 --- a/akka-tutorials/akka-tutorial-second/project/build.properties +++ b/akka-tutorials/akka-tutorial-second/project/build.properties @@ -1,5 +1,5 @@ project.organization=se.scalablesolutions.akka project.name=akka-tutorial-second -project.version=1.2-SNAPSHOT +project.version=2.0-SNAPSHOT build.scala.versions=2.9.0 sbt.version=0.7.7 diff --git a/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala b/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala index aa263a988e..fb121fcd3e 100644 --- a/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala +++ b/akka-tutorials/akka-tutorial-second/project/plugins/Plugins.scala @@ -2,5 +2,5 @@ import sbt._ class Plugins(info: ProjectInfo) extends PluginDefinition(info) { val akkaRepo = "Akka Repo" at "http://akka.io/repository" - val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.2-SNAPSHOT" + val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT" } diff --git a/config/akka-reference.conf b/config/akka-reference.conf index 4ca27ad32b..e9741d78d0 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -6,7 +6,7 @@ # Modify as needed. akka { - version = "1.2-SNAPSHOT" # Akka version, checked against the runtime version of Akka. + version = "2.0-SNAPSHOT" # Akka version, checked against the runtime version of Akka. enabled-modules = [] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"] diff --git a/project/build.properties b/project/build.properties index fbcb83ae2d..d9cc9584b6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,6 +1,6 @@ project.organization=se.scalablesolutions.akka project.name=akka -project.version=1.2-SNAPSHOT +project.version=2.0-SNAPSHOT build.scala.versions=2.9.0 sbt.version=0.7.7 diff --git a/scripts/run_akka.sh b/scripts/run_akka.sh index 1d7ce97c21..32a9479f99 100755 --- a/scripts/run_akka.sh +++ b/scripts/run_akka.sh @@ -1,6 +1,6 @@ #!/bin/bash cd $AKKA_HOME -VERSION=1.2-SNAPSHOT +VERSION=2.0-SNAPSHOT TARGET_DIR=dist/$VERSION/$1 shift 1 VMARGS=$@