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 c7a574a7f0..db7c40be23 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.1-SNAPSHOT")) + getString("akka.version") must equal(Some("1.2-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 1b5d8f774e..341a69ae3f 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.1-SNAPSHOT" + val VERSION = "1.2-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 f3d9589815..e6b1758877 100644 --- a/akka-tutorials/akka-tutorial-first/pom.xml +++ b/akka-tutorials/akka-tutorial-first/pom.xml @@ -15,7 +15,7 @@ se.scalablesolutions.akka akka-actor - 1.1-SNAPSHOT + 1.2-SNAPSHOT diff --git a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java index 034dec5178..24264b52a7 100644 --- a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java +++ b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java @@ -27,8 +27,8 @@ import java.util.concurrent.CountDownLatch; *
  *   $ cd akka-1.1
  *   $ export AKKA_HOME=`pwd`
- *   $ javac -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar akka/tutorial/first/java/Pi.java
- *   $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.java.Pi
+ *   $ javac -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar akka/tutorial/first/java/Pi.java
+ *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.java.Pi
  *   $ ...
  * 
*

diff --git a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala index 41f562791a..6164ae00cb 100644 --- a/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala @@ -21,8 +21,8 @@ import java.util.concurrent.CountDownLatch *

  *   $ cd akka-1.1
  *   $ export AKKA_HOME=`pwd`
- *   $ scalac -cp dist/akka-actor-1.1-SNAPSHOT.jar Pi.scala
- *   $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.scala.Pi
+ *   $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
+ *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.scala.Pi
  *   $ ...
  * 
*

diff --git a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java index 6397c09148..1829428f5b 100644 --- a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java +++ b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java @@ -29,8 +29,8 @@ import akka.routing.UntypedLoadBalancer; *

  *   $ cd akka-1.1
  *   $ export AKKA_HOME=`pwd`
- *   $ javac -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar akka/tutorial/java/second/Pi.java
- *   $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.java.second.Pi
+ *   $ javac -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar akka/tutorial/java/second/Pi.java
+ *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.java.second.Pi
  *   $ ...
  * 
*

diff --git a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala index 35d29f8f6c..f671605359 100644 --- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala +++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala @@ -22,8 +22,8 @@ import System.{currentTimeMillis => now} *

  *   $ cd akka-1.1
  *   $ export AKKA_HOME=`pwd`
- *   $ scalac -cp dist/akka-actor-1.1-SNAPSHOT.jar Pi.scala
- *   $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.second.Pi
+ *   $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
+ *   $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.second.Pi
  *   $ ...
  * 
*

diff --git a/config/akka-reference.conf b/config/akka-reference.conf index 9a647c6ad5..3a44e12e5a 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -6,7 +6,7 @@ # Modify as needed. akka { - version = "1.1-SNAPSHOT" # Akka version, checked against the runtime version of Akka. + version = "1.2-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 ccf3e56038..2f760f3270 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,5 +1,5 @@ project.organization=se.scalablesolutions.akka project.name=akka -project.version=1.1-SNAPSHOT +project.version=1.2-SNAPSHOT build.scala.versions=2.9.0.RC3 sbt.version=0.7.6.RC0 diff --git a/scripts/run_akka.sh b/scripts/run_akka.sh index a58c021482..1d7ce97c21 100755 --- a/scripts/run_akka.sh +++ b/scripts/run_akka.sh @@ -1,6 +1,6 @@ #!/bin/bash cd $AKKA_HOME -VERSION=1.1-SNAPSHOT +VERSION=1.2-SNAPSHOT TARGET_DIR=dist/$VERSION/$1 shift 1 VMARGS=$@ @@ -13,4 +13,4 @@ else fi export AKKA_HOME=`pwd` -java -jar ${VMARGS} ${VERSION}.jar \ No newline at end of file +java -jar ${VMARGS} ${VERSION}.jar