Skip to content

Commit

Permalink
Update version for release 2.1-M1
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorklang committed Jul 28, 2012
1 parent 39c2c3e commit 8207064
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
Expand Up @@ -25,8 +25,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-M1")
settings.ConfigVersion must equal("2.1-M1")

getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/resources/reference.conf
Expand Up @@ -7,7 +7,7 @@

akka {
# Akka version, checked against the runtime version of Akka.
version = "2.1-SNAPSHOT"
version = "2.1-M1"

# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/scala/akka/actor/ActorSystem.scala
Expand Up @@ -21,7 +21,7 @@ import akka.actor.cell.ChildrenContainer

object ActorSystem {

val Version: String = "2.1-SNAPSHOT"
val Version: String = "2.1-M1"

val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
case null | "" | "." None
Expand Down
4 changes: 2 additions & 2 deletions akka-docs/conf.py
Expand Up @@ -17,8 +17,8 @@

project = u'Akka'
copyright = u'2011, Typesafe Inc'
version = '2.1-SNAPSHOT'
release = '2.1-SNAPSHOT'
version = '2.1-M1'
release = '2.1-M1'

pygments_style = 'simple'
highlight_language = 'scala'
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/dev/multi-jvm-testing.rst
Expand Up @@ -46,7 +46,7 @@ multi-JVM testing::

lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka",
version := "2.1-SNAPSHOT",
version := "2.1-M1",
scalaVersion := "2.9.1",
crossPaths := false
)
Expand Down
26 changes: 13 additions & 13 deletions akka-docs/intro/getting-started.rst
Expand Up @@ -31,16 +31,16 @@ Modules

Akka is very modular and has many JARs for containing different features.

- ``akka-actor-2.1-SNAPSHOT.jar`` -- Classic Actors, Typed Actors, IO Actor etc.
- ``akka-remote-2.1-SNAPSHOT.jar`` -- Remote Actors
- ``akka-testkit-2.1-SNAPSHOT.jar`` -- Toolkit for testing Actor systems
- ``akka-kernel-2.1-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
- ``akka-transactor-2.1-SNAPSHOT.jar`` -- Transactors - transactional actors, integrated with Scala STM
- ``akka-agent-2.1-SNAPSHOT.jar`` -- Agents, integrated with Scala STM
- ``akka-camel-2.1-SNAPSHOT.jar`` -- Apache Camel integration
- ``akka-zeromq-2.1-SNAPSHOT.jar`` -- ZeroMQ integration
- ``akka-slf4j-2.1-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
- ``akka-<storage-system>-mailbox-2.1-SNAPSHOT.jar`` -- Akka durable mailboxes
- ``akka-actor-2.1-M1.jar`` -- Classic Actors, Typed Actors, IO Actor etc.
- ``akka-remote-2.1-M1.jar`` -- Remote Actors
- ``akka-testkit-2.1-M1.jar`` -- Toolkit for testing Actor systems
- ``akka-kernel-2.1-M1.jar`` -- Akka microkernel for running a bare-bones mini application server
- ``akka-transactor-2.1-M1.jar`` -- Transactors - transactional actors, integrated with Scala STM
- ``akka-agent-2.1-M1.jar`` -- Agents, integrated with Scala STM
- ``akka-camel-2.1-M1.jar`` -- Apache Camel integration
- ``akka-zeromq-2.1-M1.jar`` -- ZeroMQ integration
- ``akka-slf4j-2.1-M1.jar`` -- SLF4J Event Handler Listener
- ``akka-<storage-system>-mailbox-2.1-M1.jar`` -- Akka durable mailboxes

How to see the JARs dependencies of each Akka module is described in the
:ref:`dependencies` section.
Expand Down Expand Up @@ -96,14 +96,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.1-SNAPSHOT:
2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.1-M1:

.. code-block:: xml
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.1-M1</version>
</dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
Expand All @@ -130,7 +130,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.1-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.1-M1"


Using Akka with Eclipse
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/java/remoting.rst
Expand Up @@ -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.1-SNAPSHOT</version>
<version>2.1-M1</version>
</dependency>

To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/modules/camel.rst
Expand Up @@ -6,7 +6,7 @@
#######

.. note::
The Akka Camel module has not been migrated to Akka 2.1-SNAPSHOT yet.
The Akka Camel module has not been migrated to Akka 2.1-M1 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
Expand Down
6 changes: 3 additions & 3 deletions akka-docs/modules/durable-mailbox.rst
Expand Up @@ -94,11 +94,11 @@ added in concrete subclass like this:
.. includecode:: code/docs/actor/mailbox/DurableMailboxDocSpec.scala
:include: custom-mailbox-test

You find DurableMailboxDocSpec in ``akka-mailboxes-common-test-2.1-SNAPSHOT.jar``.
You find DurableMailboxDocSpec in ``akka-mailboxes-common-test-2.1-M1.jar``.
Add this dependency::

"com.typesafe.akka" % "akka-mailboxes-common-test" % "2.1-SNAPSHOT"
"com.typesafe.akka" % "akka-mailboxes-common-test" % "2.1-M1"

For more inspiration you can look at the old implementations based on Redis, MongoDB, Beanstalk,
and ZooKeeper, which can be found in Akka git repository tag
`v2.0.1 <https://github.com/akka/akka/tree/v2.0.1/akka-durable-mailboxes>`_.
`v2.0.1 <https://github.com/akka/akka/tree/v2.0.1/akka-durable-mailboxes>`_.
2 changes: 1 addition & 1 deletion akka-docs/scala/remoting.rst
Expand Up @@ -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.1-SNAPSHOT"
"com.typesafe.akka" % "akka-remote" % "2.1-M1"

To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file::
Expand Down
2 changes: 1 addition & 1 deletion akka-kernel/src/main/dist/README
Expand Up @@ -2,7 +2,7 @@
Akka
====

This is the Akka 2.1-SNAPSHOT download.
This is the Akka 2.1-M1 download.

Included are all libraries, documentation, and sources for Akka.

Expand Down
2 changes: 1 addition & 1 deletion 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-M1/
4 changes: 2 additions & 2 deletions akka-sbt-plugin/sample/project/Build.scala
Expand Up @@ -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-M1"
val ScalaVersion = "2.9.1"

lazy val HelloKernel = Project(
Expand Down Expand Up @@ -49,7 +49,7 @@ object Dependencies {
object Dependency {
// Versions
object V {
val Akka = "2.1-SNAPSHOT"
val Akka = "2.1-M1"
}

val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka
Expand Down
2 changes: 1 addition & 1 deletion 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.1-SNAPSHOT")
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-M1")
2 changes: 1 addition & 1 deletion project/AkkaBuild.scala
Expand Up @@ -23,7 +23,7 @@ object AkkaBuild extends Build {

lazy val buildSettings = Seq(
organization := "com.typesafe.akka",
version := "2.1-SNAPSHOT",
version := "2.1-M1",
scalaVersion := "2.10.0-M6"
)

Expand Down

0 comments on commit 8207064

Please sign in to comment.