Bumping the version of Akka master to 2.2-SNAPSHOT
This commit is contained in:
parent
4887fdf219
commit
6c89f640b6
10 changed files with 13 additions and 13 deletions
|
|
@ -24,8 +24,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.2-SNAPSHOT")
|
||||
settings.ConfigVersion must equal("2.2-SNAPSHOT")
|
||||
|
||||
getBoolean("akka.daemonic") must equal(false)
|
||||
getBoolean("akka.actor.serialize-messages") must equal(false)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
akka {
|
||||
# Akka version, checked against the runtime version of Akka.
|
||||
version = "2.1-SNAPSHOT"
|
||||
version = "2.2-SNAPSHOT"
|
||||
|
||||
# Home directory of Akka, modules in the deploy directory will be loaded
|
||||
home = ""
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import util.{ Failure, Success }
|
|||
|
||||
object ActorSystem {
|
||||
|
||||
val Version: String = "2.1-SNAPSHOT"
|
||||
val Version: String = "2.2-SNAPSHOT"
|
||||
|
||||
val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
|
||||
case null | "" | "." ⇒ None
|
||||
|
|
|
|||
|
|
@ -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.2-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
|
||||
|
|
|
|||
2
akka-kernel/src/main/dist/README
vendored
2
akka-kernel/src/main/dist/README
vendored
|
|
@ -2,7 +2,7 @@
|
|||
Akka
|
||||
====
|
||||
|
||||
This is the Akka 2.1-SNAPSHOT download.
|
||||
This is the Akka 2.2-SNAPSHOT download.
|
||||
|
||||
Included are all libraries, documentation, and sources for Akka.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.2-SNAPSHOT/
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-sample-cluster-experimental-japi</artifactId>
|
||||
<version>2.1-SNAPSHOT</version>
|
||||
<version>2.2-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
|
@ -36,4 +36,4 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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.2-SNAPSHOT"
|
||||
val ScalaVersion = "2.10.0-M6"
|
||||
|
||||
lazy val HelloKernel = Project(
|
||||
|
|
@ -49,7 +49,7 @@ object Dependencies {
|
|||
object Dependency {
|
||||
// Versions
|
||||
object V {
|
||||
val Akka = "2.1-SNAPSHOT"
|
||||
val Akka = "2.2-SNAPSHOT"
|
||||
}
|
||||
|
||||
val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka
|
||||
|
|
|
|||
|
|
@ -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.2-SNAPSHOT")
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ object AkkaBuild extends Build {
|
|||
|
||||
lazy val buildSettings = Seq(
|
||||
organization := "com.typesafe.akka",
|
||||
version := "2.1-SNAPSHOT",
|
||||
version := "2.2-SNAPSHOT",
|
||||
// FIXME: use 2.10.0 for final
|
||||
scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0-RC1")
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue