diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index 559e35d870..fad739a570 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -71,10 +71,9 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
Await.result(failure fallbackTo timedOut, timeout.duration) should be("Timedout")
Await.result(timedOut fallbackTo empty, timeout.duration) should be("Timedout")
Await.result(failure fallbackTo failure fallbackTo timedOut, timeout.duration) should be("Timedout")
- val expected = if (scala.util.Properties.versionNumberString.startsWith("2.10.")) "last" else "br0ken"
intercept[RuntimeException] {
Await.result(failure fallbackTo otherFailure, timeout.duration)
- }.getMessage should be(expected)
+ }.getMessage should be("br0ken")
}
}
"completed with a result" must {
diff --git a/akka-samples/akka-docs-java-lambda/build.sbt b/akka-samples/akka-docs-java-lambda/build.sbt
index d06eb9a04a..60e1f5a40f 100644
--- a/akka-samples/akka-docs-java-lambda/build.sbt
+++ b/akka-samples/akka-docs-java-lambda/build.sbt
@@ -2,7 +2,7 @@ name := "akka-docs-java-lambda"
version := "2.4-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
compileOrder := CompileOrder.ScalaThenJava
diff --git a/akka-samples/akka-sample-camel-java/build.sbt b/akka-samples/akka-sample-camel-java/build.sbt
index bed772281d..f9cec2be6b 100644
--- a/akka-samples/akka-sample-camel-java/build.sbt
+++ b/akka-samples/akka-sample-camel-java/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-camel-java"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
diff --git a/akka-samples/akka-sample-camel-scala/build.sbt b/akka-samples/akka-sample-camel-scala/build.sbt
index 052ef297bf..829a38cb39 100644
--- a/akka-samples/akka-sample-camel-scala/build.sbt
+++ b/akka-samples/akka-sample-camel-scala/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-camel-scala"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
diff --git a/akka-samples/akka-sample-cluster-java/build.sbt b/akka-samples/akka-sample-cluster-java/build.sbt
index b3a0294abe..ad6c07972b 100644
--- a/akka-samples/akka-sample-cluster-java/build.sbt
+++ b/akka-samples/akka-sample-cluster-java/build.sbt
@@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-java",
- version := "1.0",
- scalaVersion := "2.10.3",
+ version := "2.3-SNAPSHOT",
+ scalaVersion := "2.10.4",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq(
diff --git a/akka-samples/akka-sample-cluster-scala/build.sbt b/akka-samples/akka-sample-cluster-scala/build.sbt
index 24b65a20e7..21ba97957d 100644
--- a/akka-samples/akka-sample-cluster-scala/build.sbt
+++ b/akka-samples/akka-sample-cluster-scala/build.sbt
@@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-scala",
- version := "1.0",
- scalaVersion := "2.10.3",
+ version := "2.3-SNAPSHOT",
+ scalaVersion := "2.10.4",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq(
diff --git a/akka-samples/akka-sample-fsm-java-lambda/build.sbt b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
index 843e53cf6d..efcd94cf42 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
@@ -1,8 +1,8 @@
name := "akka-docs-java-lambda"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
diff --git a/akka-samples/akka-sample-fsm-java-lambda/pom.xml b/akka-samples/akka-sample-fsm-java-lambda/pom.xml
index a191565795..741b95ae0b 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-fsm-java-lambda/pom.xml
@@ -11,7 +11,7 @@
sample
akka-sample-fsm-java-lambda
jar
- 1.0
+ 2.3-SNAPSHOT
diff --git a/akka-samples/akka-sample-fsm-scala/build.sbt b/akka-samples/akka-sample-fsm-scala/build.sbt
index dc21e0dfcf..cf6262a2ce 100644
--- a/akka-samples/akka-sample-fsm-scala/build.sbt
+++ b/akka-samples/akka-sample-fsm-scala/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-fsm-scala"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-main-java/build.sbt b/akka-samples/akka-sample-main-java/build.sbt
index d67874381e..3f5b41d638 100644
--- a/akka-samples/akka-sample-main-java/build.sbt
+++ b/akka-samples/akka-sample-main-java/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-main-java"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-main-scala/build.sbt b/akka-samples/akka-sample-main-scala/build.sbt
index 44b6b34efc..29b2b99438 100644
--- a/akka-samples/akka-sample-main-scala/build.sbt
+++ b/akka-samples/akka-sample-main-scala/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-main-scala"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-multi-node-scala/build.sbt b/akka-samples/akka-sample-multi-node-scala/build.sbt
index fa13ddeb3d..8e9e310f2c 100644
--- a/akka-samples/akka-sample-multi-node-scala/build.sbt
+++ b/akka-samples/akka-sample-multi-node-scala/build.sbt
@@ -8,8 +8,8 @@ val project = Project(
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-multi-node-scala",
- version := "1.0",
- scalaVersion := "2.10.3",
+ version := "2.3-SNAPSHOT",
+ scalaVersion := "2.10.4",
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % akkaVersion,
"com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion,
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
index 73710759c3..aafa2df34e 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
@@ -17,7 +17,7 @@
2.6.0
1.6.0
2.5.0
- 2.10.3
+ 2.10.4
2.10
2.0
1.2.0
diff --git a/akka-samples/akka-sample-persistence-java-lambda/pom.xml b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
index 29e12a2b7d..b1e4d0327e 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
@@ -11,7 +11,7 @@
sample
akka-sample-persistence-java8
jar
- 0.0.1-SNAPSHOT
+ 2.3-SNAPSHOT
diff --git a/akka-samples/akka-sample-persistence-java/build.sbt b/akka-samples/akka-sample-persistence-java/build.sbt
index b8b0aa5888..0f1529364c 100644
--- a/akka-samples/akka-sample-persistence-java/build.sbt
+++ b/akka-samples/akka-sample-persistence-java/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-persistence-java"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-persistence-scala/build.sbt b/akka-samples/akka-sample-persistence-scala/build.sbt
index e05b63894f..ba6ee2091f 100644
--- a/akka-samples/akka-sample-persistence-scala/build.sbt
+++ b/akka-samples/akka-sample-persistence-scala/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-persistence-scala"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-remote-java/build.sbt b/akka-samples/akka-sample-remote-java/build.sbt
index 566f0234d5..91b2b1ce82 100644
--- a/akka-samples/akka-sample-remote-java/build.sbt
+++ b/akka-samples/akka-sample-remote-java/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-remote-java"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-remote-scala/build.sbt b/akka-samples/akka-sample-remote-scala/build.sbt
index df97920680..e71b607744 100644
--- a/akka-samples/akka-sample-remote-scala/build.sbt
+++ b/akka-samples/akka-sample-remote-scala/build.sbt
@@ -1,8 +1,8 @@
name := "akka-sample-remote-scala"
-version := "1.0"
+version := "2.3-SNAPSHOT"
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index dc69f4c354..de66c30a4c 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -35,7 +35,7 @@ object AkkaBuild extends Build {
val enableMiMa = false
- val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.3")
+ val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.4")
val Seq(scalaEpoch, scalaMajor) = """(\d+)\.(\d+)\..*""".r.unapplySeq(requestedScalaVersion).get.map(_.toInt)
lazy val buildSettings = Seq(
@@ -246,7 +246,7 @@ object AkkaBuild extends Build {
id = "akka-agent",
base = file("akka-agent"),
dependencies = Seq(actor, testkit % "test->test"),
- settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.agent ++ Seq(
+ settings = defaultSettings ++ formatSettings ++ scaladocSettingsNoVerificationOfDiagrams ++ javadocSettings ++ OSGi.agent ++ Seq(
libraryDependencies ++= Dependencies.agent,
previousArtifact := akkaPreviousArtifact("akka-agent")
)
@@ -473,6 +473,8 @@ object AkkaBuild extends Build {
base = file("akka-samples/akka-sample-osgi-dining-hakkers/uncommons"),
settings = sampleSettings ++ osgiSampleSettings ++ OSGi.osgiDiningHakkersSampleUncommons ++ Seq(
libraryDependencies ++= Dependencies.uncommons,
+ // allow publishLocal/publishM2 to overwrite
+ isSnapshot := true,
version := "1.2.0"
)
)
@@ -683,6 +685,7 @@ object AkkaBuild extends Build {
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
javacOptions in doc ++= Seq("-encoding", "UTF-8", "-source", "1.6"),
+ incOptions := incOptions.value.withNameHashing(true),
crossVersion := CrossVersion.binary,
diff --git a/project/build.properties b/project/build.properties
index 37b489cb6e..f53a483b1c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.2-RC2