Change 2.0.4-SNAPSHOT to 2.0-SNAPSHOT, see #2817

akka · Dec 19, 2012 · a13ae02 · a13ae02
1 parent dad64fa
commit a13ae02
Show file tree

Hide file tree

Showing 28 changed files with 40 additions and 40 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
@@ -23,8 +23,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
       {
         import config._
 
-        getString("akka.version") must equal("2.0.4-SNAPSHOT")
-        settings.ConfigVersion must equal("2.0.4-SNAPSHOT")
+        getString("akka.version") must equal("2.0-SNAPSHOT")
+        settings.ConfigVersion must equal("2.0-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
@@ -7,7 +7,7 @@
 
 akka {
   # Akka version, checked against the runtime version of Akka.
-  version = "2.0.4-SNAPSHOT"
+  version = "2.0-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
@@ -23,7 +23,7 @@ import collection.immutable.Stack
 
 object ActorSystem {
 
-  val Version = "2.0.4-SNAPSHOT"
+  val Version = "2.0-SNAPSHOT"
 
   val EnvHome = System.getenv("AKKA_HOME") match {
     case null | "" | "." ⇒ None

diff --git a/akka-docs/conf.py b/akka-docs/conf.py
@@ -17,8 +17,8 @@
 
 project = u'Akka'
 copyright = u'2011, Typesafe Inc'
-version = '2.0.4-SNAPSHOT'
-release = '2.0.4-SNAPSHOT'
+version = '2.0-SNAPSHOT'
+release = '2.0-SNAPSHOT'
 
 pygments_style = 'simple'
 highlight_language = 'scala'

diff --git a/akka-docs/dev/multi-jvm-testing.rst b/akka-docs/dev/multi-jvm-testing.rst
@@ -46,7 +46,7 @@ multi-JVM testing::
 
      lazy val buildSettings = Defaults.defaultSettings ++ Seq(
        organization := "com.typesafe.akka",
-       version      := "2.0.4-SNAPSHOT",
+       version      := "2.0-SNAPSHOT",
        scalaVersion := "2.9.1",
        crossPaths   := false
      )

diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst
@@ -31,12 +31,12 @@ Modules
 
 Akka is very modular and has many JARs for containing different features.
 
-- ``akka-actor-2.0.4-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
-- ``akka-remote-2.0.4-SNAPSHOT.jar`` -- Remote Actors
-- ``akka-slf4j-2.0.4-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
-- ``akka-testkit-2.0.4-SNAPSHOT.jar`` -- Toolkit for testing Actors
-- ``akka-kernel-2.0.4-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
-- ``akka-<storage-system>-mailbox-2.0.4-SNAPSHOT.jar`` -- Akka durable mailboxes
+- ``akka-actor-2.0-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
+- ``akka-remote-2.0-SNAPSHOT.jar`` -- Remote Actors
+- ``akka-slf4j-2.0-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
+- ``akka-testkit-2.0-SNAPSHOT.jar`` -- Toolkit for testing Actors
+- ``akka-kernel-2.0-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
+- ``akka-<storage-system>-mailbox-2.0-SNAPSHOT.jar`` -- Akka durable mailboxes
 
 How to see the JARs dependencies of each Akka module is described in the
 :ref:`dependencies` section. Worth noting is that ``akka-actor`` has zero
@@ -93,14 +93,14 @@ Summary of the essential parts for using Akka with Maven:
     <url>http://repo.typesafe.com/typesafe/releases/</url>
   </repository>
 
-2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0.4-SNAPSHOT:
+2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-SNAPSHOT:
 
 .. code-block:: xml
 
   <dependency>
     <groupId>com.typesafe.akka</groupId>
     <artifactId>akka-actor</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </dependency>
 
 **Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
@@ -127,7 +127,7 @@ SBT installation instructions on `https://github.com/harrah/xsbt/wiki/Setup <htt
 
     resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
 
-    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0.4-SNAPSHOT"
+    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
 
 
 Using Akka with Eclipse

diff --git a/akka-docs/java/remoting.rst b/akka-docs/java/remoting.rst
@@ -14,7 +14,7 @@ The Akka remoting is a separate jar file. Make sure that you have the following
   <dependency>
     <groupId>com.typesafe.akka</groupId>
     <artifactId>akka-remote</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
   </dependency>
 
 To enable remote capabilities in your Akka project you should, at a minimum, add the following changes

diff --git a/akka-docs/modules/camel.rst b/akka-docs/modules/camel.rst
@@ -6,7 +6,7 @@
 #######
 
 .. note::
-    The Akka Camel module has not been migrated to Akka 2.0.4-SNAPSHOT yet.
+    The Akka Camel module has not been migrated to Akka 2.0-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-docs/modules/spring.rst b/akka-docs/modules/spring.rst
@@ -6,7 +6,7 @@
 ####################
 
 .. note::
-    The Akka Spring module has not been migrated to Akka 2.0.4-SNAPSHOT yet.
+    The Akka Spring module has not been migrated to Akka 2.0-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-docs/project/migration-guide-1.3.x-2.0.x.rst b/akka-docs/project/migration-guide-1.3.x-2.0.x.rst
@@ -27,7 +27,7 @@ be removed in Akka 2.1.
 
 The migration kit is provided in separate jar files. Add the following dependency::
 
-  "com.typesafe.akka" % "akka-actor-migration" % "2.0.4-SNAPSHOT"
+  "com.typesafe.akka" % "akka-actor-migration" % "2.0-SNAPSHOT"
 
 The first step of the migration is to do some trivial replacements.
 Search and replace the following (be careful with the non qualified names):

diff --git a/akka-docs/scala/remoting.rst b/akka-docs/scala/remoting.rst
@@ -12,7 +12,7 @@ Preparing your ActorSystem for Remoting
 
 The Akka remoting is a separate jar file. Make sure that you have the following dependency in your project::
 
-  "com.typesafe.akka" % "akka-remote" % "2.0.4-SNAPSHOT"
+  "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
 
 To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
 to your ``application.conf`` file::

diff --git a/akka-kernel/src/main/dist/README b/akka-kernel/src/main/dist/README
@@ -2,7 +2,7 @@
 Akka
 ====
 
-This is the Akka 2.0.4-SNAPSHOT download.
+This is the Akka 2.0-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
@@ -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.0.4-SNAPSHOT/
+# For more info about config, please visit the Akka Documentation: http://akka.io/docs/
diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala
@@ -6,8 +6,8 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
 
 object HelloKernelBuild extends Build {
   val Organization = "akka.sample"
-  val Version      = "2.0.4-SNAPSHOT"
-  val ScalaVersion = "2.9.1"
+  val Version      = "2.0-SNAPSHOT"
+  val ScalaVersion = "2.9.2"
 
   lazy val HelloKernel = Project(
     id = "hello-kernel",
@@ -49,7 +49,7 @@ object Dependencies {
 object Dependency {
   // Versions
   object V {
-    val Akka      = "2.0.4-SNAPSHOT"
+    val Akka      = "2.0-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
@@ -1,3 +1,3 @@
 resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0.4-SNAPSHOT")
+addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT")
diff --git a/akka-spring/src/main/resources/META-INF/spring.schemas b/akka-spring/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://akka.io/akka-2.0.4-SNAPSHOT.xsd=akka/spring/akka-2.0.4-SNAPSHOT.xsd
+http\://akka.io/akka-2.0-SNAPSHOT.xsd=akka/spring/akka-2.0-SNAPSHOT.xsd
diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf
@@ -6,7 +6,7 @@
 # Modify as needed.
 
 akka {
-  version = "2.0.4-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 = ["remote"]       # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
 

diff --git a/akka-spring/src/test/resources/appContext.xml b/akka-spring/src/test/resources/appContext.xml
@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://akka.io/schema/akka
-       http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+       http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
     <akka:typed-actor id="sample"
                         interface="akka.spring.SampleBeanIntf"

diff --git a/akka-spring/src/test/resources/appContextCamelServiceCustom.xml b/akka-spring/src/test/resources/appContextCamelServiceCustom.xml
@@ -6,7 +6,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd
+http://akka.io/akka-2.0-SNAPSHOT.xsd
 http://camel.apache.org/schema/spring
 http://camel.apache.org/schema/spring/camel-spring.xsd">
 

diff --git a/akka-spring/src/test/resources/appContextCamelServiceDefault.xml b/akka-spring/src/test/resources/appContextCamelServiceDefault.xml
@@ -6,7 +6,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd
+http://akka.io/akka-2.0-SNAPSHOT.xsd
 http://camel.apache.org/schema/spring
 http://camel.apache.org/schema/spring/camel-spring.xsd">
 

diff --git a/akka-spring/src/test/resources/dispatcher-config.xml b/akka-spring/src/test/resources/dispatcher-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
 
   <akka:typed-actor id="typed-actor-with-dispatcher"

diff --git a/akka-spring/src/test/resources/failing-appContext.xml b/akka-spring/src/test/resources/failing-appContext.xml
@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://akka.io/schema/akka
-       http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+       http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
     <akka:typed-actor id="bean"
                         implementation="org.springframework.core.io.ResourceEditor"

diff --git a/akka-spring/src/test/resources/property-config.xml b/akka-spring/src/test/resources/property-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
 
   <akka:property-placeholder location="akka-test.conf"/>

diff --git a/akka-spring/src/test/resources/server-managed-config.xml b/akka-spring/src/test/resources/server-managed-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
 
   <akka:untyped-actor id="client-managed-remote-untyped-actor"

diff --git a/akka-spring/src/test/resources/supervisor-config.xml b/akka-spring/src/test/resources/supervisor-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
   <akka:supervision id="supervision1">
     <akka:restart-strategy failover="AllForOne" retries="3" timerange="1000">

diff --git a/akka-spring/src/test/resources/typed-actor-config.xml b/akka-spring/src/test/resources/typed-actor-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
   <akka:typed-actor id="simple-typed-actor"
                       interface="akka.spring.foo.IMyPojo"

diff --git a/akka-spring/src/test/resources/untyped-actor-config.xml b/akka-spring/src/test/resources/untyped-actor-config.xml
@@ -7,7 +7,7 @@
 http://www.springframework.org/schema/beans
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0-SNAPSHOT.xsd">
 
   <akka:untyped-actor id="simple-untyped-actor"
                       implementation="akka.spring.foo.PingActor"/>

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
@@ -20,7 +20,7 @@ object AkkaBuild extends Build {
 
   lazy val buildSettings = Seq(
     organization := "com.typesafe.akka",
-    version      := "2.0.4-SNAPSHOT",
+    version      := "2.0-SNAPSHOT",
     scalaVersion := "2.9.2"
   )