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 5e69a0ef85..a9a0d391ce 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -25,8 +25,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin { import config._ - getString("akka.version") should be("2.3-SNAPSHOT") - settings.ConfigVersion should be("2.3-SNAPSHOT") + getString("akka.version") should be("2.4-SNAPSHOT") + settings.ConfigVersion should be("2.4-SNAPSHOT") getBoolean("akka.daemonic") should be(false) diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index 0a04fc1c8a..1c0f37deae 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -7,7 +7,7 @@ akka { # Akka version, checked against the runtime version of Akka. - version = "2.3-SNAPSHOT" + version = "2.4-SNAPSHOT" # Home directory of Akka, modules in the deploy directory will be loaded home = "" diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 79654fa978..88b41c0073 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -23,7 +23,7 @@ import scala.util.control.{ NonFatal, ControlThrowable } object ActorSystem { - val Version: String = "2.3-SNAPSHOT" + val Version: String = "2.4-SNAPSHOT" val EnvHome: Option[String] = System.getenv("AKKA_HOME") match { case null | "" | "." ⇒ None diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/akka/util/Timeout.scala index 522b24d480..eb2660eccb 100644 --- a/akka-actor/src/main/scala/akka/util/Timeout.scala +++ b/akka-actor/src/main/scala/akka/util/Timeout.scala @@ -18,7 +18,7 @@ case class Timeout(duration: FiniteDuration) { */ @deprecated("please be explicit about the time unit and use the two-argument version", "2.3") def this(timeout: Long) = this(Duration(timeout, TimeUnit.MILLISECONDS)) - + /** * Construct a Timeout from the given time unit and factor. */ @@ -40,7 +40,7 @@ object Timeout { */ @deprecated("please be explicit about the time unit and use the two-argument version", "2.3") def apply(timeout: Long): Timeout = new Timeout(timeout) - + /** * Construct a Timeout from the given time unit and factor. */ diff --git a/akka-kernel/src/main/dist/README b/akka-kernel/src/main/dist/README index 940e2b4f26..d1eacb7972 100644 --- a/akka-kernel/src/main/dist/README +++ b/akka-kernel/src/main/dist/README @@ -2,7 +2,7 @@ Akka ==== -This is the Akka 2.3-SNAPSHOT download. +This is the Akka 2.4-SNAPSHOT download. Included are all libraries, documentation, and sources for Akka. diff --git a/akka-kernel/src/main/dist/config/application.conf b/akka-kernel/src/main/dist/config/application.conf index c9daa2549e..513a211e3f 100644 --- a/akka-kernel/src/main/dist/config/application.conf +++ b/akka-kernel/src/main/dist/config/application.conf @@ -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.3-SNAPSHOT/ +# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.4-SNAPSHOT/ diff --git a/akka-samples/akka-docs-java-lambda/build.sbt b/akka-samples/akka-docs-java-lambda/build.sbt index d304633775..d06eb9a04a 100644 --- a/akka-samples/akka-docs-java-lambda/build.sbt +++ b/akka-samples/akka-docs-java-lambda/build.sbt @@ -1,6 +1,6 @@ name := "akka-docs-java-lambda" -version := "2.3-SNAPSHOT" +version := "2.4-SNAPSHOT" scalaVersion := "2.10.3" @@ -11,7 +11,7 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a") libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT", - "com.typesafe.akka" %% "akka-testkit" % "2.3-SNAPSHOT" % "test", + "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", + "com.typesafe.akka" %% "akka-testkit" % "2.4-SNAPSHOT" % "test", "junit" % "junit" % "4.11" % "test", "com.novocode" % "junit-interface" % "0.10" % "test") diff --git a/akka-samples/akka-docs-java-lambda/pom.xml b/akka-samples/akka-docs-java-lambda/pom.xml index f3ab3a8a12..4a2b5028a4 100644 --- a/akka-samples/akka-docs-java-lambda/pom.xml +++ b/akka-samples/akka-docs-java-lambda/pom.xml @@ -11,18 +11,18 @@ sample akka-docs-java-lambda jar - 2.3-SNAPSHOT + 2.4-SNAPSHOT com.typesafe.akka akka-actor_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT com.typesafe.akka akka-testkit_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT junit diff --git a/akka-samples/akka-sample-camel-java/build.sbt b/akka-samples/akka-sample-camel-java/build.sbt index 288934017e..bed772281d 100644 --- a/akka-samples/akka-sample-camel-java/build.sbt +++ b/akka-samples/akka-sample-camel-java/build.sbt @@ -5,7 +5,7 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-camel" % "2.3-SNAPSHOT", + "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT", "org.apache.camel" % "camel-jetty" % "2.10.3", "org.apache.camel" % "camel-quartz" % "2.10.3", "org.slf4j" % "slf4j-api" % "1.7.2", diff --git a/akka-samples/akka-sample-camel-java/tutorial/index.html b/akka-samples/akka-sample-camel-java/tutorial/index.html index 9751aa9615..b2a0cc569a 100644 --- a/akka-samples/akka-sample-camel-java/tutorial/index.html +++ b/akka-samples/akka-sample-camel-java/tutorial/index.html @@ -8,7 +8,7 @@

This tutorial contains 3 samples of -Akka Camel. +Akka Camel.

    @@ -26,7 +26,7 @@ This tutorial contains 3 samples of

    This example demonstrates how to implement consumer and producer actors that support - + Asynchronous routing with their Camel endpoints. The sample application transforms the content of the Akka homepage, http://akka.io, by replacing every occurrence of *Akka* with *AKKA*. diff --git a/akka-samples/akka-sample-camel-scala/build.sbt b/akka-samples/akka-sample-camel-scala/build.sbt index 161a8588ee..052ef297bf 100644 --- a/akka-samples/akka-sample-camel-scala/build.sbt +++ b/akka-samples/akka-sample-camel-scala/build.sbt @@ -5,7 +5,7 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-camel" % "2.3-SNAPSHOT", + "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT", "org.apache.camel" % "camel-jetty" % "2.10.3", "org.apache.camel" % "camel-quartz" % "2.10.3", "org.slf4j" % "slf4j-api" % "1.7.2", diff --git a/akka-samples/akka-sample-camel-scala/tutorial/index.html b/akka-samples/akka-sample-camel-scala/tutorial/index.html index c396ffa4ad..648ba73a48 100644 --- a/akka-samples/akka-sample-camel-scala/tutorial/index.html +++ b/akka-samples/akka-sample-camel-scala/tutorial/index.html @@ -8,7 +8,7 @@

    This tutorial contains 3 samples of -Akka Camel. +Akka Camel.

      @@ -26,7 +26,7 @@ This tutorial contains 3 samples of

      This example demonstrates how to implement consumer and producer actors that support - + Asynchronous routing with their Camel endpoints. The sample application transforms the content of the Akka homepage, http://akka.io, by replacing every occurrence of *Akka* with *AKKA*. diff --git a/akka-samples/akka-sample-cluster-java/build.sbt b/akka-samples/akka-sample-cluster-java/build.sbt index 966269aeaf..b3a0294abe 100644 --- a/akka-samples/akka-sample-cluster-java/build.sbt +++ b/akka-samples/akka-sample-cluster-java/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.3-SNAPSHOT" +val akkaVersion = "2.4-SNAPSHOT" val project = Project( id = "akka-sample-cluster-java", @@ -41,4 +41,4 @@ val project = Project( testResults.summaries ++ multiNodeResults.summaries) } ) -) configs (MultiJvm) \ No newline at end of file +) configs (MultiJvm) diff --git a/akka-samples/akka-sample-cluster-java/tutorial/index.html b/akka-samples/akka-sample-cluster-java/tutorial/index.html index d1fd417b8b..b7762fe334 100644 --- a/akka-samples/akka-sample-cluster-java/tutorial/index.html +++ b/akka-samples/akka-sample-cluster-java/tutorial/index.html @@ -8,7 +8,7 @@

      This tutorial contains 4 samples illustrating different -Akka cluster features. +Akka cluster features.

      • Subscribe to cluster membership events
        • @@ -54,7 +54,7 @@ actor.

        You can read more about the cluster concepts in the -documentation. +documentation.

        @@ -143,7 +143,7 @@ that happen in the cluster.

        In the previous sample we saw how to subscribe to cluster membership events. You can read more about it in the -documentation. +documentation. How can cluster membership events be used?

        @@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the

        Cluster Aware Routers

        -All routers +All routers can be made aware of member nodes in the cluster, i.e. deploying new routees or looking up routees on nodes in the cluster. When a node becomes unreachable or leaves the cluster the routees of that node are @@ -244,7 +244,7 @@ when a node becomes reachable again, after having been unreachable.

        You can read more about cluster aware routers in the -documentation. +documentation.

        @@ -346,7 +346,7 @@ and deploys workers instead of looking them up.

        Open StatsSampleOneMasterMain.java. -To keep track of a single master we use the Cluster Singleton +To keep track of a single master we use the Cluster Singleton in the contrib module. The ClusterSingletonManager is started on each node.

        @@ -412,7 +412,7 @@ the AdaptiveLoadBalancingPool and AdaptiveLoadBalancingGroup<

        You can read more about cluster metrics in the -documentation. +documentation.

        diff --git a/akka-samples/akka-sample-cluster-scala/build.sbt b/akka-samples/akka-sample-cluster-scala/build.sbt index e81fcc4753..24b65a20e7 100644 --- a/akka-samples/akka-sample-cluster-scala/build.sbt +++ b/akka-samples/akka-sample-cluster-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.3-SNAPSHOT" +val akkaVersion = "2.4-SNAPSHOT" val project = Project( id = "akka-sample-cluster-scala", @@ -41,4 +41,4 @@ val project = Project( testResults.summaries ++ multiNodeResults.summaries) } ) -) configs (MultiJvm) \ No newline at end of file +) configs (MultiJvm) diff --git a/akka-samples/akka-sample-cluster-scala/tutorial/index.html b/akka-samples/akka-sample-cluster-scala/tutorial/index.html index 23cc46c236..4ea72e1a8e 100644 --- a/akka-samples/akka-sample-cluster-scala/tutorial/index.html +++ b/akka-samples/akka-sample-cluster-scala/tutorial/index.html @@ -8,7 +8,7 @@

        This tutorial contains 4 samples illustrating different -Akka cluster features. +Akka cluster features.

        • Subscribe to cluster membership events
          • @@ -54,7 +54,7 @@ actor.

          You can read more about the cluster concepts in the -documentation. +documentation.

          @@ -143,7 +143,7 @@ that happen in the cluster.

          In the previous sample we saw how to subscribe to cluster membership events. You can read more about it in the -documentation. +documentation. How can cluster membership events be used?

          @@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the

          Cluster Aware Routers

          -All routers +All routers can be made aware of member nodes in the cluster, i.e. deploying new routees or looking up routees on nodes in the cluster. When a node becomes unreachable or leaves the cluster the routees of that node are @@ -244,7 +244,7 @@ when a node becomes reachable again, after having been unreachable.

          You can read more about cluster aware routers in the -documentation. +documentation.

          @@ -345,7 +345,7 @@ and deploys workers instead of looking them up.

          Open StatsSampleOneMaster.scala. -To keep track of a single master we use the Cluster Singleton +To keep track of a single master we use the Cluster Singleton in the contrib module. The ClusterSingletonManager is started on each node.

          @@ -411,7 +411,7 @@ the AdaptiveLoadBalancingPool and AdaptiveLoadBalancingGroup<

          You can read more about cluster metrics in the -documentation. +documentation.

          diff --git a/akka-samples/akka-sample-fsm-java-lambda/build.sbt b/akka-samples/akka-sample-fsm-java-lambda/build.sbt index 1aecca6cba..843e53cf6d 100644 --- a/akka-samples/akka-sample-fsm-java-lambda/build.sbt +++ b/akka-samples/akka-sample-fsm-java-lambda/build.sbt @@ -9,7 +9,7 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a") libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT", - "com.typesafe.akka" %% "akka-testkit" % "2.3-SNAPSHOT" % "test", + "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", + "com.typesafe.akka" %% "akka-testkit" % "2.4-SNAPSHOT" % "test", "junit" % "junit" % "4.11" % "test", "com.novocode" % "junit-interface" % "0.10" % "test") diff --git a/akka-samples/akka-sample-fsm-java-lambda/pom.xml b/akka-samples/akka-sample-fsm-java-lambda/pom.xml index 2c6d8ac9a2..a191565795 100644 --- a/akka-samples/akka-sample-fsm-java-lambda/pom.xml +++ b/akka-samples/akka-sample-fsm-java-lambda/pom.xml @@ -17,12 +17,12 @@ com.typesafe.akka akka-actor_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT com.typesafe.akka akka-testkit_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT junit diff --git a/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html b/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html index f2ff91c437..351a6cbb40 100644 --- a/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html +++ b/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html @@ -40,7 +40,7 @@ In the log output you can see the actions of the Hakker actors.

          Read more about become in -the documentation. +the documentation.

        @@ -64,7 +64,7 @@ In the log output you can see the actions of the Hakker actors.

        Read more about akka.actor.FSM in -the documentation. +the documentation.

      diff --git a/akka-samples/akka-sample-fsm-scala/build.sbt b/akka-samples/akka-sample-fsm-scala/build.sbt index 410850f86b..44b6b34efc 100644 --- a/akka-samples/akka-sample-fsm-scala/build.sbt +++ b/akka-samples/akka-sample-fsm-scala/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-fsm-scala/tutorial/index.html b/akka-samples/akka-sample-fsm-scala/tutorial/index.html index 48641d39cf..c7acdff794 100644 --- a/akka-samples/akka-sample-fsm-scala/tutorial/index.html +++ b/akka-samples/akka-sample-fsm-scala/tutorial/index.html @@ -40,7 +40,7 @@ In the log output you can see the actions of the Hakker actors.

      Read more about become in -the documentation. +the documentation.

    @@ -64,7 +64,7 @@ In the log output you can see the actions of the Hakker actors.

    Read more about akka.actor.FSM in -the documentation. +the documentation.

diff --git a/akka-samples/akka-sample-main-java/build.sbt b/akka-samples/akka-sample-main-java/build.sbt index 4d6728a29c..d67874381e 100644 --- a/akka-samples/akka-sample-main-java/build.sbt +++ b/akka-samples/akka-sample-main-java/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-main-java/pom.xml b/akka-samples/akka-sample-main-java/pom.xml index 9750947a75..88629eb3b8 100644 --- a/akka-samples/akka-sample-main-java/pom.xml +++ b/akka-samples/akka-sample-main-java/pom.xml @@ -17,7 +17,7 @@ com.typesafe.akka akka-actor_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT diff --git a/akka-samples/akka-sample-main-java/tutorial/index.html b/akka-samples/akka-sample-main-java/tutorial/index.html index 71bba2da11..e6325187ad 100644 --- a/akka-samples/akka-sample-main-java/tutorial/index.html +++ b/akka-samples/akka-sample-main-java/tutorial/index.html @@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package sample.hello and it further assumes that you have the required JAR files for scala-library, typesafe-config and akka-actor available. The easiest would be to manage these dependencies with a -build tool. +build tool.

diff --git a/akka-samples/akka-sample-main-scala/build.sbt b/akka-samples/akka-sample-main-scala/build.sbt index 410850f86b..44b6b34efc 100644 --- a/akka-samples/akka-sample-main-scala/build.sbt +++ b/akka-samples/akka-sample-main-scala/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-main-scala/tutorial/index.html b/akka-samples/akka-sample-main-scala/tutorial/index.html index d643ee7ee9..c87f15a9ff 100644 --- a/akka-samples/akka-sample-main-scala/tutorial/index.html +++ b/akka-samples/akka-sample-main-scala/tutorial/index.html @@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package sample.hello and it further assumes that you have the required JAR files for scala-library, typesafe-config and akka-actor available. The easiest would be to manage these dependencies with a -build tool. +build tool.

diff --git a/akka-samples/akka-sample-multi-node-scala/build.sbt b/akka-samples/akka-sample-multi-node-scala/build.sbt index 795f17e762..fa13ddeb3d 100644 --- a/akka-samples/akka-sample-multi-node-scala/build.sbt +++ b/akka-samples/akka-sample-multi-node-scala/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtMultiJvm import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm -val akkaVersion = "2.3-SNAPSHOT" +val akkaVersion = "2.4-SNAPSHOT" val project = Project( id = "akka-sample-multi-node-scala", diff --git a/akka-samples/akka-sample-multi-node-scala/tutorial/index.html b/akka-samples/akka-sample-multi-node-scala/tutorial/index.html index 1da12362f5..2240387e64 100644 --- a/akka-samples/akka-sample-multi-node-scala/tutorial/index.html +++ b/akka-samples/akka-sample-multi-node-scala/tutorial/index.html @@ -13,12 +13,12 @@ and test classes for illustrating multi-node testing with Akka.

Please refer to the full documentation of -multi-node testing +multi-node testing and the closely related -multi-jvm testing +multi-jvm testing for details. There is also an section on -cluster testing. +cluster testing.

@@ -79,7 +79,7 @@ the sbt prompt:

The same test can be run on multiple machines as described in the -multi-node testing documentation. +multi-node testing documentation.

diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml index 931640172d..e2d652cb84 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml @@ -5,7 +5,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT 4.0.0 diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml index 7494df3892..8d6883b29f 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml @@ -7,7 +7,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT akka-sample-osgi-dining-hakkers-dist diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml index b383fb098d..6bb3f0b330 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml @@ -7,7 +7,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT akka-sample-osgi-dining-hakkers diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml index cd3c190436..74ef462e2a 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml @@ -5,7 +5,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT 4.0.0 diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml index 00c91b96cd..c6f8145e92 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml @@ -5,7 +5,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT 4.0.0 diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml index 843fb49df7..79172212d4 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml @@ -5,7 +5,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT 4.0.0 diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh b/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh index 96bbc4c524..4c9d8d40b3 100755 --- a/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh +++ b/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh @@ -1,7 +1,7 @@ #!/bin/bash projdir=$(cd $(dirname $0); pwd) -version=2.3-SNAPSHOT +version=2.4-SNAPSHOT # This directory is specified in the build as the root of the tar # Use tar --strip-components=1 to ignore the root diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml index e3468c83ec..966c655ede 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT UTF-8 - 2.3-SNAPSHOT + 2.4-SNAPSHOT 2.3.1 ${karaf.version} 3.8.0.Final diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml index a4d1a0cf65..1a1789e87b 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml @@ -5,7 +5,7 @@ com.typesafe.akka.akka-sample-osgi-dining-hakkers project - 2.3-SNAPSHOT + 2.4-SNAPSHOT 4.0.0 diff --git a/akka-samples/akka-sample-persistence-java/build.sbt b/akka-samples/akka-sample-persistence-java/build.sbt index efe55eeb35..b8b0aa5888 100644 --- a/akka-samples/akka-sample-persistence-java/build.sbt +++ b/akka-samples/akka-sample-persistence-java/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-persistence-experimental" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-persistence-java/tutorial/index.html b/akka-samples/akka-sample-persistence-java/tutorial/index.html index 9b0c6aae61..9533d32cf3 100644 --- a/akka-samples/akka-sample-persistence-java/tutorial/index.html +++ b/akka-samples/akka-sample-persistence-java/tutorial/index.html @@ -8,7 +8,7 @@

This tutorial contains examples that illustrate a subset of -Akka Persistence features. +Akka Persistence features.

  • Processors and channels
    • @@ -63,7 +63,7 @@ messages to the processor.

    Eventsourced processors

    EventsourcedExample.java -is described in detail in the Event sourcing +is described in detail in the Event sourcing section of the user documentation. With every application run, the ExampleProcessor is recovered from events stored in previous application runs, processes new commands, stores new events and snapshots and prints the current processor state to stdout. @@ -91,7 +91,7 @@ To run this example, go to the Run tab, and

    -Event sourcing +Event sourcing on the other hand, does not persist commands directly but rather events that have been derived from received commands (not shown here). These events are known to be successfully applicable to current processor state i.e. there's no need for deleting them from the journal. Event sourced processors usually have a lower throughput than command diff --git a/akka-samples/akka-sample-persistence-java8/pom.xml b/akka-samples/akka-sample-persistence-java8/pom.xml index 666f4478b7..29e12a2b7d 100644 --- a/akka-samples/akka-sample-persistence-java8/pom.xml +++ b/akka-samples/akka-sample-persistence-java8/pom.xml @@ -17,17 +17,17 @@ com.typesafe.akka akka-actor_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT com.typesafe.akka akka-persistence-experimental_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT com.typesafe.akka akka-testkit_2.10 - 2.3-SNAPSHOT + 2.4-SNAPSHOT junit diff --git a/akka-samples/akka-sample-persistence-scala/build.sbt b/akka-samples/akka-sample-persistence-scala/build.sbt index 873562e06e..e05b63894f 100644 --- a/akka-samples/akka-sample-persistence-scala/build.sbt +++ b/akka-samples/akka-sample-persistence-scala/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-persistence-experimental" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-persistence-scala/tutorial/index.html b/akka-samples/akka-sample-persistence-scala/tutorial/index.html index 9769a2fca5..bb28189590 100644 --- a/akka-samples/akka-sample-persistence-scala/tutorial/index.html +++ b/akka-samples/akka-sample-persistence-scala/tutorial/index.html @@ -8,7 +8,7 @@

    This tutorial contains examples that illustrate a subset of -Akka Persistence features. +Akka Persistence features.

    • Processors and channels
      • @@ -82,7 +82,7 @@ messages to the processor.

      Eventsourced processors

      EventsourcedExample.scala -is described in detail in the Event sourcing +is described in detail in the Event sourcing section of the user documentation. With every application run, the ExampleProcessor is recovered from events stored in previous application runs, processes new commands, stores new events and snapshots and prints the current processor state to stdout. @@ -110,7 +110,7 @@ To run this example, go to the Run tab, and

      -Event sourcing +Event sourcing on the other hand, does not persist commands directly but rather events that have been derived from received commands (not shown here). These events are known to be successfully applicable to current processor state i.e. there's no need for deleting them from the journal. Event sourced processors usually have a lower throughput than command diff --git a/akka-samples/akka-sample-remote-java/build.sbt b/akka-samples/akka-sample-remote-java/build.sbt index 57f9e1e148..566f0234d5 100644 --- a/akka-samples/akka-sample-remote-java/build.sbt +++ b/akka-samples/akka-sample-remote-java/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-remote" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-remote-java/tutorial/index.html b/akka-samples/akka-sample-remote-java/tutorial/index.html index 3051741cae..45ca1b3ac1 100644 --- a/akka-samples/akka-sample-remote-java/tutorial/index.html +++ b/akka-samples/akka-sample-remote-java/tutorial/index.html @@ -7,7 +7,7 @@

      -In order to showcase the remote capabilities of Akka +In order to showcase the remote capabilities of Akka we thought a remote calculator could do the trick. This sample demonstrates both remote deployment and look-up of remote actors.

      diff --git a/akka-samples/akka-sample-remote-scala/build.sbt b/akka-samples/akka-sample-remote-scala/build.sbt index e81d7c337d..df97920680 100644 --- a/akka-samples/akka-sample-remote-scala/build.sbt +++ b/akka-samples/akka-sample-remote-scala/build.sbt @@ -5,6 +5,6 @@ version := "1.0" scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-remote" % "2.3-SNAPSHOT" + "com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT" ) diff --git a/akka-samples/akka-sample-remote-scala/tutorial/index.html b/akka-samples/akka-sample-remote-scala/tutorial/index.html index 0c22f1949a..952f5e608f 100644 --- a/akka-samples/akka-sample-remote-scala/tutorial/index.html +++ b/akka-samples/akka-sample-remote-scala/tutorial/index.html @@ -7,7 +7,7 @@

      -In order to showcase the remote capabilities of Akka +In order to showcase the remote capabilities of Akka we thought a remote calculator could do the trick. This sample demonstrates both remote deployment and look-up of remote actors.

      diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index c75ab5322f..80d610d4a7 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -14,6 +14,7 @@ import com.typesafe.sbt.osgi.SbtOsgi.{ OsgiKeys, defaultOsgiSettings } import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact import com.typesafe.tools.mima.plugin.MimaKeys.reportBinaryIssues +import com.typesafe.tools.mima.plugin.MimaKeys.binaryIssueFilters import com.typesafe.sbt.SbtSite.site import com.typesafe.sbt.site.SphinxSupport import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, generateEpub, generatedEpub, sphinxInputs, sphinxPackages, Sphinx } @@ -38,7 +39,7 @@ object AkkaBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", - version := "2.3-SNAPSHOT", + version := "2.4-SNAPSHOT", scalaVersion := requestedScalaVersion, scalaBinaryVersion := System.getProperty("akka.scalaBinaryVersion", if (scalaVersion.value contains "-") scalaVersion.value else scalaBinaryVersion.value) ) @@ -288,7 +289,7 @@ object AkkaBuild extends Build { fork in Test := true, javaOptions in Test := defaultMultiJvmOptions, libraryDependencies ++= Dependencies.persistence, - previousArtifact := akkaPreviousArtifact("akka-persistence") + previousArtifact := akkaPreviousArtifact("akka-persistence-experimental") ) ) @@ -794,10 +795,17 @@ object AkkaBuild extends Build { testOptions in Test += Tests.Argument("-oDF"), // don't save test output to a file - testListeners in (Test, test) := Seq(TestLogger(streams.value.log, {_ => streams.value.log }, logBuffered.value)) + testListeners in (Test, test) := Seq(TestLogger(streams.value.log, {_ => streams.value.log }, logBuffered.value)), + + validatePullRequestTask, + // add reportBinaryIssues to validatePullRequest on minor version maintenance branch + validatePullRequest <<= validatePullRequest.dependsOn(reportBinaryIssues) + ) ++ mavenLocalResolverSettings val validatePullRequest = TaskKey[Unit]("validate-pull-request", "Additional tasks for pull request validation") + // the tasks that to run for validation is defined in defaultSettings + val validatePullRequestTask = validatePullRequest := () def githubUrl(v: String): String = { val branch = if (v.endsWith("SNAPSHOT")) "master" else "v" + v @@ -961,13 +969,21 @@ object AkkaBuild extends Build { else file } + + lazy val mimaIgnoredProblems = { + import com.typesafe.tools.mima.core._ + Seq( + // add filters here, see release-2.2 branch + ) + } lazy val mimaSettings = mimaDefaultSettings ++ Seq( // MiMa - previousArtifact := None + previousArtifact := None, + binaryIssueFilters ++= mimaIgnoredProblems ) - def akkaPreviousArtifact(id: String, organization: String = "com.typesafe.akka", version: String = "2.2.0", + def akkaPreviousArtifact(id: String, organization: String = "com.typesafe.akka", version: String = "2.3.0", crossVersion: String = "2.10"): Option[sbt.ModuleID] = if (enableMiMa) { val fullId = if (crossVersion.isEmpty) id else id + "_" + crossVersion @@ -1054,7 +1070,7 @@ object AkkaBuild extends Build { OsgiKeys.exportPackage := packages ) def defaultImports = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(), "*") - def akkaImport(packageName: String = "akka.*") = "%s;version=\"[2.3,2.4)\"".format(packageName) + def akkaImport(packageName: String = "akka.*") = "%s;version=\"[2.4,2.5)\"".format(packageName) def configImport(packageName: String = "com.typesafe.config.*") = "%s;version=\"[1.2.0,1.3.0)\"".format(packageName) def protobufImport(packageName: String = "com.google.protobuf.*") = "%s;version=\"[2.5.0,2.6.0)\"".format(packageName) def scalaImport(packageName: String = "scala.*") = "%s;version=\"[2.10,2.11)\"".format(packageName)