From 0557ece346d1654f21ade825e6bfc97d578d8f8c Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 24 Jan 2012 22:49:40 +0100 Subject: [PATCH] Update version for release 2.0-M3 --- .../test/scala/akka/config/ConfigSpec.scala | 4 +-- akka-actor/src/main/resources/reference.conf | 2 +- .../main/scala/akka/actor/ActorSystem.scala | 2 +- akka-docs/conf.py | 4 +-- .../intro/getting-started-first-java.rst | 26 +++++++-------- .../getting-started-first-scala-eclipse.rst | 16 +++++----- .../intro/getting-started-first-scala.rst | 32 +++++++++---------- akka-docs/intro/getting-started.rst | 18 +++++------ akka-docs/java/remoting.rst | 2 +- akka-docs/modules/camel.rst | 2 +- akka-docs/modules/spring.rst | 2 +- .../project/migration-guide-1.3.x-2.0.x.rst | 2 +- akka-docs/scala/remoting.rst | 2 +- akka-kernel/src/main/dist/README | 2 +- .../src/main/resources/common.conf | 2 +- .../main/resources/META-INF/spring.schemas | 2 +- ...{akka-2.0-SNAPSHOT.xsd => akka-2.0-M3.xsd} | 0 akka-spring/src/test/resources/akka-test.conf | 2 +- akka-spring/src/test/resources/appContext.xml | 2 +- .../appContextCamelServiceCustom.xml | 2 +- .../appContextCamelServiceDefault.xml | 2 +- .../src/test/resources/dispatcher-config.xml | 2 +- .../src/test/resources/failing-appContext.xml | 2 +- .../src/test/resources/property-config.xml | 2 +- .../test/resources/server-managed-config.xml | 2 +- .../src/test/resources/supervisor-config.xml | 2 +- .../src/test/resources/typed-actor-config.xml | 2 +- .../test/resources/untyped-actor-config.xml | 2 +- akka-tutorials/akka-tutorial-first/pom.xml | 4 +-- .../project/TutorialBuild.scala | 8 ++--- project/AkkaBuild.scala | 2 +- scripts/run_akka.sh | 2 +- src/main/ls/2.0.json | 4 +-- 33 files changed, 81 insertions(+), 81 deletions(-) rename akka-spring/src/main/resources/akka/spring/{akka-2.0-SNAPSHOT.xsd => akka-2.0-M3.xsd} (100%) 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 67c7a51b60d..5f1a5bdb311 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -20,8 +20,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference) { val config = settings.config import config._ - getString("akka.version") must equal("2.0-SNAPSHOT") - settings.ConfigVersion must equal("2.0-SNAPSHOT") + getString("akka.version") must equal("2.0-M3") + settings.ConfigVersion must equal("2.0-M3") getBoolean("akka.daemonic") must equal(false) diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index 999c4286c2a..87d2e19cbc7 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.0-SNAPSHOT" + version = "2.0-M3" # 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 c6842d0dc2f..6e0bbf37839 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -24,7 +24,7 @@ import collection.immutable.Stack object ActorSystem { - val Version = "2.0-SNAPSHOT" + val Version = "2.0-M3" val EnvHome = System.getenv("AKKA_HOME") match { case null | "" | "." ⇒ None diff --git a/akka-docs/conf.py b/akka-docs/conf.py index 8a9e8c3240f..65588a8ab84 100644 --- 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-SNAPSHOT' -release = '2.0-SNAPSHOT' +version = '2.0-M3' +release = '2.0-M3' pygments_style = 'simple' highlight_language = 'scala' diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst index 7aeab18ccfe..fd95b2b5571 100644 --- a/akka-docs/intro/getting-started-first-java.rst +++ b/akka-docs/intro/getting-started-first-java.rst @@ -66,7 +66,7 @@ To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one. -Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from +Let's get the ``akka-2.0-M3.zip`` distribution of Akka from http://akka.io/downloads/ which includes everything we need for this tutorial. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in. In my case I choose to install it in @@ -77,10 +77,10 @@ You need to do one more thing in order to install Akka properly: set the I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable:: - $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT + $ cd /Users/jboner/tools/akka-2.0-M3 $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.0-M3 The distribution looks like this:: @@ -100,7 +100,7 @@ The distribution looks like this:: - In the ``src`` directory we have the source JARs for Akka. The only JAR we will need for this tutorial (apart from the -``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka`` +``scala-library.jar`` JAR) is the ``akka-actor-2.0-M3.jar`` JAR in the ``lib/akka`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors. @@ -120,10 +120,10 @@ modules are: - ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Beanstalk and Zookeeper .. - ``akka-amqp`` -- AMQP integration -.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures -.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) -.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration -.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration +.. - ``akka-stm-2.0-M3.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.0-M3.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) +.. - ``akka-camel-typed-2.0-M3.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.0-M3.jar`` -- Spring framework integration @@ -192,7 +192,7 @@ repositories, including akka.io. It should now look something like this: com.typesafe.akka akka-actor - 2.0-SNAPSHOT + 2.0-M3 @@ -350,19 +350,19 @@ time. When that's done open up a shell and step in to the Akka distribution (``cd $AKKA_HOME``). First we need to compile the source file. That is done with Java's compiler -``javac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` and the +``javac``. Our application depends on the ``akka-actor-2.0-M3.jar`` and the ``scala-library.jar`` JAR files, so let's add them to the compiler classpath when we compile the source:: - $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar tutorial/akka/tutorial/first/java/Pi.java + $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M3.jar tutorial/akka/tutorial/first/java/Pi.java When we have compiled the source file we are ready to run the application. This -is done with ``java`` but yet again we need to add the ``akka-actor-2.0-SNAPSHOT.jar`` +is done with ``java`` but yet again we need to add the ``akka-actor-2.0-M3.jar`` and the ``scala-library.jar`` JAR files to the classpath as well as the classes we compiled ourselves:: $ java \ - -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \ + -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M3.jar:. \ akka.tutorial.java.first.Pi Pi estimate: 3.1435501812459323 diff --git a/akka-docs/intro/getting-started-first-scala-eclipse.rst b/akka-docs/intro/getting-started-first-scala-eclipse.rst index 9b6a610ba3d..edb107faf74 100644 --- a/akka-docs/intro/getting-started-first-scala-eclipse.rst +++ b/akka-docs/intro/getting-started-first-scala-eclipse.rst @@ -88,7 +88,7 @@ To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one. -Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from +Let's get the ``akka-2.0-M3.zip`` distribution of Akka from http://akka.io/downloads/ which includes everything we need for this tutorial. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in. In my case I choose to install it in @@ -99,10 +99,10 @@ You need to do one more thing in order to install Akka properly: set the I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable:: - $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT + $ cd /Users/jboner/tools/akka-2.0-M3 $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.0-M3 The distribution looks like this:: @@ -122,7 +122,7 @@ The distribution looks like this:: - In the ``src`` directory we have the source JARs for Akka. The only JAR we will need for this tutorial (apart from the -``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka`` +``scala-library.jar`` JAR) is the ``akka-actor-2.0-M3.jar`` JAR in the ``lib/akka`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors. @@ -142,10 +142,10 @@ modules are: - ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Zookeeper .. - ``akka-amqp`` -- AMQP integration -.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures -.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) -.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration -.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration +.. - ``akka-stm-2.0-M3.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.0-M3.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) +.. - ``akka-camel-typed-2.0-M3.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.0-M3.jar`` -- Spring framework integration Downloading and installing the Scala IDE for Eclipse diff --git a/akka-docs/intro/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst index 8759343a2eb..06cdfacf82c 100644 --- a/akka-docs/intro/getting-started-first-scala.rst +++ b/akka-docs/intro/getting-started-first-scala.rst @@ -89,7 +89,7 @@ To build and run the tutorial sample from the command line, you have to download Akka. If you prefer to use SBT to build and run the sample then you can skip this section and jump to the next one. -Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from +Let's get the ``akka-2.0-M3.zip`` distribution of Akka from http://akka.io/downloads/ which includes everything we need for this tutorial. Once you have downloaded the distribution unzip it in the folder you would like to have Akka installed in. In my case I choose to install it in @@ -100,10 +100,10 @@ You need to do one more thing in order to install Akka properly: set the I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable:: - $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT + $ cd /Users/jboner/tools/akka-2.0-M3 $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.0-M3 The distribution looks like this:: @@ -123,7 +123,7 @@ The distribution looks like this:: - In the ``src`` directory we have the source JARs for Akka. The only JAR we will need for this tutorial (apart from the -``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka`` +``scala-library.jar`` JAR) is the ``akka-actor-2.0-M3.jar`` JAR in the ``lib/akka`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors. @@ -144,10 +144,10 @@ modules are: - ``akka-amqp`` -- AMQP integration -.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures -.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) -.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration -.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration +.. - ``akka-stm-2.0-M3.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.0-M3.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world) +.. - ``akka-camel-typed-2.0-M3.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.0-M3.jar`` -- Spring framework integration Downloading and installing Scala @@ -216,7 +216,7 @@ in the directory you want to create your project in:: resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/" - libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT" + libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M3" Create a directory ``src/main/scala`` in which you will store the Scala source files. @@ -226,14 +226,14 @@ modules beyond ``akka-actor``, you can add these as ``libraryDependencies`` in ``build.sbt``. Note that there must be a blank line between each. Here is an example adding ``akka-remote``:: - libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT" + libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M3" - libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT" + libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-M3" So, now we are all set. SBT itself needs a whole bunch of dependencies but our project will only need -one; ``akka-actor-2.0-SNAPSHOT.jar``. SBT will download that as well. +one; ``akka-actor-2.0-M3.jar``. SBT will download that as well. Start writing the code @@ -402,19 +402,19 @@ If you have not typed in (or copied) the code for the tutorial as in When that's done open up a shell and step in to the Akka distribution (``cd $AKKA_HOME``). First we need to compile the source file. That is done with Scala's compiler -``scalac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` JAR +``scalac``. Our application depends on the ``akka-actor-2.0-M3.jar`` JAR file, so let's add that to the compiler classpath when we compile the source:: - $ scalac -cp lib/akka/akka-actor-2.0-SNAPSHOT.jar Pi.scala + $ scalac -cp lib/akka/akka-actor-2.0-M3.jar Pi.scala When we have compiled the source file we are ready to run the application. This is done with ``java`` but yet again we need to add the -``akka-actor-2.0-SNAPSHOT.jar`` JAR file to the classpath, and this time we also +``akka-actor-2.0-M3.jar`` JAR file to the classpath, and this time we also need to add the Scala runtime library ``scala-library.jar`` and the classes we compiled ourselves:: $ java \ - -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \ + -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M3.jar:. \ akka.tutorial.first.scala.Pi Pi estimate: 3.1435501812459323 diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst index 16a4a46c2f1..ed7b868fde8 100644 --- a/akka-docs/intro/getting-started.rst +++ b/akka-docs/intro/getting-started.rst @@ -44,12 +44,12 @@ Modules Akka is very modular and has many JARs for containing different features. -- ``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--mailbox-2.0-SNAPSHOT.jar`` -- Akka durable mailboxes +- ``akka-actor-2.0-M3.jar`` -- Standard Actors, Typed Actors and much more +- ``akka-remote-2.0-M3.jar`` -- Remote Actors +- ``akka-slf4j-2.0-M3.jar`` -- SLF4J Event Handler Listener +- ``akka-testkit-2.0-M3.jar`` -- Toolkit for testing Actors +- ``akka-kernel-2.0-M3.jar`` -- Akka microkernel for running a bare-bones mini application server +- ``akka--mailbox-2.0-M3.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 @@ -105,14 +105,14 @@ Summary of the essential parts for using Akka with Maven: http://repo.typesafe.com/typesafe/releases/ -2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-SNAPSHOT: +2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-M3: .. code-block:: xml com.typesafe.akka akka-actor - 2.0-SNAPSHOT + 2.0-M3 **Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published. @@ -138,7 +138,7 @@ SBT installation instructions on `https://github.com/harrah/xsbt/wiki/Setup com.typesafe.akka akka-remote - 2.0-SNAPSHOT + 2.0-M3 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 index 9891a94de8a..a2b71f6dc99 100644 --- 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-SNAPSHOT yet. + The Akka Camel module has not been migrated to Akka 2.0-M3 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 index 5a626e779b2..f520ad27722 100644 --- 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-SNAPSHOT yet. + The Akka Spring module has not been migrated to Akka 2.0-M3 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 index d17070aeff8..6c8b0738ec3 100644 --- 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-SNAPSHOT" + "com.typesafe.akka" % "akka-actor-migration" % "2.0-M3" 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 index 2d460aa060f..80581208257 100644 --- a/akka-docs/scala/remoting.rst +++ b/akka-docs/scala/remoting.rst @@ -11,7 +11,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-SNAPSHOT" + "com.typesafe.akka" % "akka-remote" % "2.0-M3" 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 index 179f3c97a94..4626e8221e0 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.0-SNAPSHOT download. +This is the Akka 2.0-M3 download. Included are all libraries, documentation, and sources for Akka. diff --git a/akka-samples/akka-sample-remote/src/main/resources/common.conf b/akka-samples/akka-sample-remote/src/main/resources/common.conf index 79009c0aeac..cbce6e949e5 100644 --- a/akka-samples/akka-sample-remote/src/main/resources/common.conf +++ b/akka-samples/akka-sample-remote/src/main/resources/common.conf @@ -1,5 +1,5 @@ akka { - version = "2.0-SNAPSHOT" + version = "2.0-M3" actor { provider = "akka.remote.RemoteActorRefProvider" diff --git a/akka-spring/src/main/resources/META-INF/spring.schemas b/akka-spring/src/main/resources/META-INF/spring.schemas index 68e55a2fb4b..b093e2c61d9 100644 --- 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-SNAPSHOT.xsd=akka/spring/akka-2.0-SNAPSHOT.xsd +http\://akka.io/akka-2.0-M3.xsd=akka/spring/akka-2.0-M3.xsd diff --git a/akka-spring/src/main/resources/akka/spring/akka-2.0-SNAPSHOT.xsd b/akka-spring/src/main/resources/akka/spring/akka-2.0-M3.xsd similarity index 100% rename from akka-spring/src/main/resources/akka/spring/akka-2.0-SNAPSHOT.xsd rename to akka-spring/src/main/resources/akka/spring/akka-2.0-M3.xsd diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf index 806783d217a..c02503cb3ea 100644 --- 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-SNAPSHOT" # Akka version, checked against the runtime version of Akka. + version = "2.0-M3" # 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 index ee2f011b6bb..6db793eb006 100644 --- 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-SNAPSHOT.xsd"> + http://akka.io/akka-2.0-M3.xsd"> diff --git a/akka-spring/src/test/resources/appContextCamelServiceDefault.xml b/akka-spring/src/test/resources/appContextCamelServiceDefault.xml index 12c12b39f57..6b9d4e6c619 100644 --- 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-SNAPSHOT.xsd +http://akka.io/akka-2.0-M3.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 index 591070ac9f7..f53595c3fc4 100644 --- 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-SNAPSHOT.xsd"> +http://akka.io/akka-2.0-M3.xsd"> + http://akka.io/akka-2.0-M3.xsd"> +http://akka.io/akka-2.0-M3.xsd"> diff --git a/akka-spring/src/test/resources/server-managed-config.xml b/akka-spring/src/test/resources/server-managed-config.xml index f6ccafba93b..b6cbcf8d57f 100644 --- 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-SNAPSHOT.xsd"> +http://akka.io/akka-2.0-M3.xsd"> +http://akka.io/akka-2.0-M3.xsd"> diff --git a/akka-spring/src/test/resources/typed-actor-config.xml b/akka-spring/src/test/resources/typed-actor-config.xml index 1fd1d5f5616..2672ba21151 100644 --- 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-SNAPSHOT.xsd"> +http://akka.io/akka-2.0-M3.xsd"> +http://akka.io/akka-2.0-M3.xsd"> diff --git a/akka-tutorials/akka-tutorial-first/pom.xml b/akka-tutorials/akka-tutorial-first/pom.xml index 1cec835a9cb..47037eed207 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 - 2.0-SNAPSHOT + 2.0-M3 http://akka.io com.typesafe.akka akka-actor - 2.0-SNAPSHOT + 2.0-M3 diff --git a/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala b/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala index 5e5ef324930..cc91405201f 100644 --- a/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala +++ b/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala @@ -4,7 +4,7 @@ import Keys._ object TutorialBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", - version := "2.0-SNAPSHOT", + version := "2.0-M3", scalaVersion := "2.9.1" ) @@ -13,10 +13,10 @@ object TutorialBuild extends Build { base = file("."), settings = Defaults.defaultSettings ++ Seq( libraryDependencies ++= Seq( - "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT", + "com.typesafe.akka" % "akka-actor" % "2.0-M3", "junit" % "junit" % "4.5" % "test", "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test", - "com.typesafe.akka" % "akka-testkit" % "2.0-SNAPSHOT" % "test") + "com.typesafe.akka" % "akka-testkit" % "2.0-M3" % "test") ) ) -} \ No newline at end of file +} diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index d104a9db5d8..54867f1a8a0 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -18,7 +18,7 @@ object AkkaBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", - version := "2.0-SNAPSHOT", + version := "2.0-M3", scalaVersion := "2.9.1" ) diff --git a/scripts/run_akka.sh b/scripts/run_akka.sh index 32a9479f992..1e5f64c3538 100755 --- a/scripts/run_akka.sh +++ b/scripts/run_akka.sh @@ -1,6 +1,6 @@ #!/bin/bash cd $AKKA_HOME -VERSION=2.0-SNAPSHOT +VERSION=2.0-M3 TARGET_DIR=dist/$VERSION/$1 shift 1 VMARGS=$@ diff --git a/src/main/ls/2.0.json b/src/main/ls/2.0.json index 067332ed735..f3f816419d9 100644 --- a/src/main/ls/2.0.json +++ b/src/main/ls/2.0.json @@ -2,7 +2,7 @@ { "organization":"com.typesafe.akka", "name":"akka", - "version":"2.0-SNAPSHOT", + "version":"2.0-M3", "description":"Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", "site":"", "tags":["actors","stm","concurrency","distributed","fault-tolerance","scala","java","futures","dataflow","remoting"], @@ -12,4 +12,4 @@ "dependencies": [], "scalas": ["2.9.1"], "sbt": false -} \ No newline at end of file +}