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 a2aed20c6c..d24b2c4806 100644 --- 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-SNAPSHOT") - settings.ConfigVersion must equal("2.0-SNAPSHOT") + getString("akka.version") must equal("2.1-SNAPSHOT") + settings.ConfigVersion must equal("2.1-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 index 480826763f..6e747f8121 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.1-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 index 58c2393c56..2c217a9109 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 collection.immutable.Stack object ActorSystem { - val Version = "2.0-SNAPSHOT" + val Version = "2.1-SNAPSHOT" val EnvHome = System.getenv("AKKA_HOME") match { case null | "" | "." ⇒ None diff --git a/akka-docs/conf.py b/akka-docs/conf.py index 8a9e8c3240..28e3fe1591 100644 --- a/akka-docs/conf.py +++ b/akka-docs/conf.py @@ -17,8 +17,8 @@ exclude_patterns = ['_build', 'pending', 'disabled'] project = u'Akka' copyright = u'2011, Typesafe Inc' -version = '2.0-SNAPSHOT' -release = '2.0-SNAPSHOT' +version = '2.1-SNAPSHOT' +release = '2.1-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 index 18154b6c27..3b6fd44f6c 100644 --- a/akka-docs/dev/multi-jvm-testing.rst +++ b/akka-docs/dev/multi-jvm-testing.rst @@ -48,7 +48,7 @@ multi-JVM testing:: lazy val buildSettings = Defaults.defaultSettings ++ Seq( organization := "com.typesafe.akka", - version := "2.0-SNAPSHOT", + version := "2.1-SNAPSHOT", scalaVersion := "2.9.1", crossPaths := false ) @@ -381,4 +381,4 @@ same machine at the same time. The machines that are used for testing (slaves) should have ssh access to the outside world and be able to talk to each other with the internal addresses given. On the master machine ssh client is required. Obviosly git -and sbt should be installed on both master and slave machines. \ No newline at end of file +and sbt should be installed on both master and slave machines. diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst index 0a048a050f..a943555d4e 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.1-SNAPSHOT.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.1-SNAPSHOT $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.1-SNAPSHOT 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.1-SNAPSHOT.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.1-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.1-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.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.1-SNAPSHOT.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.1-SNAPSHOT @@ -360,19 +360,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.1-SNAPSHOT.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.1-SNAPSHOT.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.1-SNAPSHOT.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.1-SNAPSHOT.jar:. \ akka.tutorial.java.first.Pi Pi approximation: 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 9e02f99a71..96707b4eb3 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.1-SNAPSHOT.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.1-SNAPSHOT $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.1-SNAPSHOT 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.1-SNAPSHOT.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.1-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.1-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.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.1-SNAPSHOT.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 0d66c11eea..702c996291 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.1-SNAPSHOT.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.1-SNAPSHOT $ export AKKA_HOME=`pwd` $ echo $AKKA_HOME - /Users/jboner/tools/akka-2.0-SNAPSHOT + /Users/jboner/tools/akka-2.1-SNAPSHOT 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.1-SNAPSHOT.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.1-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures +.. - ``akka-camel-2.1-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.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration +.. - ``akka-spring-2.1-SNAPSHOT.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.1-SNAPSHOT" 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.1-SNAPSHOT" - libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT" + libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.1-SNAPSHOT" 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.1-SNAPSHOT.jar``. SBT will download that as well. Start writing the code @@ -403,19 +403,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.1-SNAPSHOT.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.1-SNAPSHOT.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.1-SNAPSHOT.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.1-SNAPSHOT.jar:. \ akka.tutorial.first.scala.Pi Pi approximation: 3.1435501812459323 diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst index 16a4a46c2f..75f62a39d9 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.1-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more +- ``akka-remote-2.1-SNAPSHOT.jar`` -- Remote Actors +- ``akka-slf4j-2.1-SNAPSHOT.jar`` -- SLF4J Event Handler Listener +- ``akka-testkit-2.1-SNAPSHOT.jar`` -- Toolkit for testing Actors +- ``akka-kernel-2.1-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server +- ``akka--mailbox-2.1-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 @@ -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.1-SNAPSHOT: .. code-block:: xml com.typesafe.akka akka-actor - 2.0-SNAPSHOT + 2.1-SNAPSHOT **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.1-SNAPSHOT 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 9891a94de8..68686ce586 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.1-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 index 5a626e779b..e7ec2de313 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.1-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 index e933d6bca8..2440068d36 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 @@ -33,7 +33,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" 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 5e613dd7e4..9ccd41366a 100644 --- a/akka-docs/scala/remoting.rst +++ b/akka-docs/scala/remoting.rst @@ -16,7 +16,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.1-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 index 179f3c97a9..b531da6164 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.1-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 index 682d41e484..4abcd7e7f8 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.0-SNAPSHOT/ +# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.1-SNAPSHOT/ diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala index 60c83740f8..959f98511e 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.0-SNAPSHOT" + val Version = "2.1-SNAPSHOT" val ScalaVersion = "2.9.1" lazy val HelloKernel = Project( @@ -49,7 +49,7 @@ object Dependencies { object Dependency { // Versions object V { - val Akka = "2.0-SNAPSHOT" + val Akka = "2.1-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 index a44d2ee72f..3f814e328e 100644 --- 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-SNAPSHOT") +addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-SNAPSHOT") diff --git a/akka-spring/src/main/resources/META-INF/spring.schemas b/akka-spring/src/main/resources/META-INF/spring.schemas index 68e55a2fb4..ae3fc27472 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.1-SNAPSHOT.xsd=akka/spring/akka-2.1-SNAPSHOT.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.1-SNAPSHOT.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.1-SNAPSHOT.xsd diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf index a4838f6cc7..bf3cc890b2 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.1-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 index ee2f011b6b..c865719bbb 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.1-SNAPSHOT.xsd"> diff --git a/akka-spring/src/test/resources/appContextCamelServiceDefault.xml b/akka-spring/src/test/resources/appContextCamelServiceDefault.xml index 12c12b39f5..b115f35dd2 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.1-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 index 591070ac9f..c0e2e857fc 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.1-SNAPSHOT.xsd"> + http://akka.io/akka-2.1-SNAPSHOT.xsd"> +http://akka.io/akka-2.1-SNAPSHOT.xsd"> diff --git a/akka-spring/src/test/resources/server-managed-config.xml b/akka-spring/src/test/resources/server-managed-config.xml index f6ccafba93..8bb7e3874c 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.1-SNAPSHOT.xsd"> +http://akka.io/akka-2.1-SNAPSHOT.xsd"> diff --git a/akka-spring/src/test/resources/typed-actor-config.xml b/akka-spring/src/test/resources/typed-actor-config.xml index 1fd1d5f561..fb8af30747 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.1-SNAPSHOT.xsd"> +http://akka.io/akka-2.1-SNAPSHOT.xsd"> diff --git a/akka-tutorials/akka-tutorial-first/pom.xml b/akka-tutorials/akka-tutorial-first/pom.xml index 1cec835a9c..01000a5896 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.1-SNAPSHOT http://akka.io com.typesafe.akka akka-actor - 2.0-SNAPSHOT + 2.1-SNAPSHOT diff --git a/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala b/akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala index 5e5ef32493..d468b69324 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.1-SNAPSHOT", 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.1-SNAPSHOT", "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.1-SNAPSHOT" % "test") ) ) -} \ No newline at end of file +} diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 0822c57bf5..e2468ff26e 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.1-SNAPSHOT", scalaVersion := "2.9.1-1" ) diff --git a/src/main/ls/2.0.json b/src/main/ls/2.0.json index 067332ed73..ff726ab2c0 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", "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 +} diff --git a/src/main/ls/2.1.json b/src/main/ls/2.1.json new file mode 100644 index 0000000000..0ec5cad9e2 --- /dev/null +++ b/src/main/ls/2.1.json @@ -0,0 +1,15 @@ + +{ + "organization":"com.typesafe.akka", + "name":"akka", + "version":"2.1-SNAPSHOT", + "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"], + "docs":"", + "licenses": [], + "resolvers": ["http://akka.io/repository/"], + "dependencies": [], + "scalas": ["2.9.1"], + "sbt": false +}