raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

switch master to 2.3-SNAPSHOT

Browse source
This commit is contained in:
Roland Kuhn 2013-07-09 10:59:36 +02:00
parent e4de146cf9
commit 39a3969061
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
View file

@ -24,8 +24,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
import config._
getString("akka.version") must equal("2.2-SNAPSHOT")
settings.ConfigVersion must equal("2.2-SNAPSHOT")
getString("akka.version") must equal("2.3-SNAPSHOT")
settings.ConfigVersion must equal("2.3-SNAPSHOT")
getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)

2
akka-actor/src/main/resources/reference.conf
View file

@ -7,7 +7,7 @@
akka {
# Akka version, checked against the runtime version of Akka.
version = "2.2-SNAPSHOT"
version = "2.3-SNAPSHOT"
# Home directory of Akka, modules in the deploy directory will be loaded
home = ""

2
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -23,7 +23,7 @@ import scala.util.control.{ NonFatal, ControlThrowable }
object ActorSystem {
val Version: String = "2.2-SNAPSHOT"
val Version: String = "2.3-SNAPSHOT"
val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
case null | "" | "." ⇒ None

2
akka-kernel/src/main/dist/README vendored
View file

@ -2,7 +2,7 @@
Akka
====
This is the Akka 2.2-SNAPSHOT download.
This is the Akka 2.3-SNAPSHOT download.
Included are all libraries, documentation, and sources for Akka.

2
akka-kernel/src/main/dist/config/application.conf vendored
View file

@ -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.2-SNAPSHOT/
# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.3-SNAPSHOT/

2
akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
View file

@ -9,7 +9,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.2-SNAPSHOT</akka.version>
<akka.version>2.3-SNAPSHOT</akka.version>
<karaf.version>2.3.0</karaf.version>
<karaf.tooling.exam.version>${karaf.version}</karaf.tooling.exam.version>
<netty.version>3.6.2.Final</netty.version>

4
akka-sbt-plugin/sample/project/Build.scala
View file

@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
object HelloKernelBuild extends Build {
val Organization = "akka.sample"
val Version = "2.2-SNAPSHOT"
val Version = "2.3-SNAPSHOT"
val ScalaVersion = "2.10.2"
lazy val HelloKernel = Project(
@ -47,7 +47,7 @@ object Dependencies {
object Dependency {
// Versions
object V {
val Akka = "2.2-SNAPSHOT"
val Akka = "2.3-SNAPSHOT"
}
val akkaKernel = "com.typesafe.akka" %% "akka-kernel" % V.Akka

2
akka-sbt-plugin/sample/project/plugins.sbt
View file

@ -1 +1 @@
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT")
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.3-SNAPSHOT")

2
project/AkkaBuild.scala
View file

@ -40,7 +40,7 @@ object AkkaBuild extends Build {
lazy val buildSettings = Seq(
organization := "com.typesafe.akka",
version := "2.2-SNAPSHOT",
version := "2.3-SNAPSHOT",
// Also change ScalaVersion in akka-sbt-plugin/sample/project/Build.scala
scalaVersion := requestedScalaVersion,
scalaBinaryVersion <<= (scalaVersion, scalaBinaryVersion)((v, bv) => System.getProperty("akka.scalaBinaryVersion", if (v contains "-") v else bv))