Bump version to 1.2-SNAPSHOT
This commit is contained in:
parent
f01db73f7f
commit
9ace0a97da
10 changed files with 15 additions and 15 deletions
|
|
@ -18,7 +18,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
|
||||||
|
|
||||||
getList("akka.boot") must equal(Nil)
|
getList("akka.boot") must equal(Nil)
|
||||||
getString("akka.time-unit") must equal(Some("seconds"))
|
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"))
|
getString("akka.actor.default-dispatcher.type") must equal(Some("GlobalExecutorBasedEventDriven"))
|
||||||
getInt("akka.actor.default-dispatcher.keep-alive-time") must equal(Some(60))
|
getInt("akka.actor.default-dispatcher.keep-alive-time") must equal(Some(60))
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ class ModuleNotAvailableException(message: String, cause: Throwable = null) exte
|
||||||
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||||
*/
|
*/
|
||||||
object Config {
|
object Config {
|
||||||
val VERSION = "1.1-SNAPSHOT"
|
val VERSION = "1.2-SNAPSHOT"
|
||||||
|
|
||||||
val HOME = {
|
val HOME = {
|
||||||
val envHome = System.getenv("AKKA_HOME") match {
|
val envHome = System.getenv("AKKA_HOME") match {
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>se.scalablesolutions.akka</groupId>
|
<groupId>se.scalablesolutions.akka</groupId>
|
||||||
<artifactId>akka-actor</artifactId>
|
<artifactId>akka-actor</artifactId>
|
||||||
<version>1.1-SNAPSHOT</version>
|
<version>1.2-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ import java.util.concurrent.CountDownLatch;
|
||||||
* <pre>
|
* <pre>
|
||||||
* $ cd akka-1.1
|
* $ cd akka-1.1
|
||||||
* $ export AKKA_HOME=`pwd`
|
* $ export AKKA_HOME=`pwd`
|
||||||
* $ javac -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar akka/tutorial/first/java/Pi.java
|
* $ javac -cp dist/akka-actor-1.2-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
|
* $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.java.Pi
|
||||||
* $ ...
|
* $ ...
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p/>
|
* <p/>
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ import java.util.concurrent.CountDownLatch
|
||||||
* <pre>
|
* <pre>
|
||||||
* $ cd akka-1.1
|
* $ cd akka-1.1
|
||||||
* $ export AKKA_HOME=`pwd`
|
* $ export AKKA_HOME=`pwd`
|
||||||
* $ scalac -cp dist/akka-actor-1.1-SNAPSHOT.jar Pi.scala
|
* $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
|
||||||
* $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.scala.Pi
|
* $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.first.scala.Pi
|
||||||
* $ ...
|
* $ ...
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p/>
|
* <p/>
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,8 @@ import akka.routing.UntypedLoadBalancer;
|
||||||
* <pre>
|
* <pre>
|
||||||
* $ cd akka-1.1
|
* $ cd akka-1.1
|
||||||
* $ export AKKA_HOME=`pwd`
|
* $ export AKKA_HOME=`pwd`
|
||||||
* $ javac -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar akka/tutorial/java/second/Pi.java
|
* $ javac -cp dist/akka-actor-1.2-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
|
* $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.java.second.Pi
|
||||||
* $ ...
|
* $ ...
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p/>
|
* <p/>
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ import System.{currentTimeMillis => now}
|
||||||
* <pre>
|
* <pre>
|
||||||
* $ cd akka-1.1
|
* $ cd akka-1.1
|
||||||
* $ export AKKA_HOME=`pwd`
|
* $ export AKKA_HOME=`pwd`
|
||||||
* $ scalac -cp dist/akka-actor-1.1-SNAPSHOT.jar Pi.scala
|
* $ scalac -cp dist/akka-actor-1.2-SNAPSHOT.jar Pi.scala
|
||||||
* $ java -cp dist/akka-actor-1.1-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.second.Pi
|
* $ java -cp dist/akka-actor-1.2-SNAPSHOT.jar:scala-library.jar:. akka.tutorial.second.Pi
|
||||||
* $ ...
|
* $ ...
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p/>
|
* <p/>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
# Modify as needed.
|
# Modify as needed.
|
||||||
|
|
||||||
akka {
|
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"]
|
enabled-modules = [] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
project.organization=se.scalablesolutions.akka
|
project.organization=se.scalablesolutions.akka
|
||||||
project.name=akka
|
project.name=akka
|
||||||
project.version=1.1-SNAPSHOT
|
project.version=1.2-SNAPSHOT
|
||||||
build.scala.versions=2.9.0.RC3
|
build.scala.versions=2.9.0.RC3
|
||||||
sbt.version=0.7.6.RC0
|
sbt.version=0.7.6.RC0
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd $AKKA_HOME
|
cd $AKKA_HOME
|
||||||
VERSION=1.1-SNAPSHOT
|
VERSION=1.2-SNAPSHOT
|
||||||
TARGET_DIR=dist/$VERSION/$1
|
TARGET_DIR=dist/$VERSION/$1
|
||||||
shift 1
|
shift 1
|
||||||
VMARGS=$@
|
VMARGS=$@
|
||||||
|
|
@ -13,4 +13,4 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export AKKA_HOME=`pwd`
|
export AKKA_HOME=`pwd`
|
||||||
java -jar ${VMARGS} ${VERSION}.jar
|
java -jar ${VMARGS} ${VERSION}.jar
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue