=pro,sam,act Change version to 2.4-SNAPSHOT
* also include the disabled mima settings
This commit is contained in:
Patrik Nordwall
parent
dfef14a590
commit
21b3d2ba48
47 changed files with 104 additions and 88 deletions
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ""
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
|||
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.3-SNAPSHOT download.
|
||||
This is the Akka 2.4-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.3-SNAPSHOT/
|
||||
# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.4-SNAPSHOT/
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@
|
|||
<groupId>sample</groupId>
|
||||
<artifactId>akka-docs-java-lambda</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-actor_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-testkit_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains 3 samples of
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/camel.html" target="_blank">Akka Camel</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html" target="_blank">Akka Camel</a>.
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
|
|
@ -26,7 +26,7 @@ This tutorial contains 3 samples of
|
|||
<p>
|
||||
This example demonstrates how to implement consumer and producer actors that
|
||||
support
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/camel.html#Asynchronous_routing" target="_blank">
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html#Asynchronous_routing" target="_blank">
|
||||
Asynchronous routing</a> with their Camel endpoints. The sample
|
||||
application transforms the content of the Akka homepage, <a href="http://akka.io" target="_blank">http://akka.io</a>,
|
||||
by replacing every occurrence of *Akka* with *AKKA*.
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains 3 samples of
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/camel.html" target="_blank">Akka Camel</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html" target="_blank">Akka Camel</a>.
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
|
|
@ -26,7 +26,7 @@ This tutorial contains 3 samples of
|
|||
<p>
|
||||
This example demonstrates how to implement consumer and producer actors that
|
||||
support
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/camel.html#Asynchronous_routing" target="_blank">
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html#Asynchronous_routing" target="_blank">
|
||||
Asynchronous routing</a> with their Camel endpoints. The sample
|
||||
application transforms the content of the Akka homepage, <a href="http://akka.io" target="_blank">http://akka.io</a>,
|
||||
by replacing every occurrence of *Akka* with *AKKA*.
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
) configs (MultiJvm)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains 4 samples illustrating different
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
|
||||
</p>
|
||||
<ul>
|
||||
<li>Subscribe to cluster membership events</li>
|
||||
|
|
@ -54,7 +54,7 @@ actor.
|
|||
|
||||
<p>
|
||||
You can read more about the cluster concepts in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/cluster-usage.html" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -143,7 +143,7 @@ that happen in the cluster.
|
|||
<p>
|
||||
In the previous sample we saw how to subscribe to cluster membership events.
|
||||
You can read more about it in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
|
||||
How can cluster membership events be used?
|
||||
</p>
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the
|
|||
<h2>Cluster Aware Routers</h2>
|
||||
|
||||
<p>
|
||||
All <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/routing.html" target="_blank">routers</a>
|
||||
All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/routing.html" target="_blank">routers</a>
|
||||
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.
|
|||
|
||||
<p>
|
||||
You can read more about cluster aware routers in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -346,7 +346,7 @@ and deploys workers instead of looking them up.
|
|||
|
||||
<p>
|
||||
Open <a href="#code/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java" class="shortcut">StatsSampleOneMasterMain.java</a>.
|
||||
To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
|
||||
To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
|
||||
in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
|
||||
</p>
|
||||
|
||||
|
|
@ -412,7 +412,7 @@ the <code>AdaptiveLoadBalancingPool</code> and <code>AdaptiveLoadBalancingGroup<
|
|||
|
||||
<p>
|
||||
You can read more about cluster metrics in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
) configs (MultiJvm)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains 4 samples illustrating different
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
|
||||
</p>
|
||||
<ul>
|
||||
<li>Subscribe to cluster membership events</li>
|
||||
|
|
@ -54,7 +54,7 @@ actor.
|
|||
|
||||
<p>
|
||||
You can read more about the cluster concepts in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -143,7 +143,7 @@ that happen in the cluster.
|
|||
<p>
|
||||
In the previous sample we saw how to subscribe to cluster membership events.
|
||||
You can read more about it in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
|
||||
How can cluster membership events be used?
|
||||
</p>
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the
|
|||
<h2>Cluster Aware Routers</h2>
|
||||
|
||||
<p>
|
||||
All <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/routing.html" target="_blank">routers</a>
|
||||
All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/routing.html" target="_blank">routers</a>
|
||||
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.
|
|||
|
||||
<p>
|
||||
You can read more about cluster aware routers in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -345,7 +345,7 @@ and deploys workers instead of looking them up.
|
|||
|
||||
<p>
|
||||
Open <a href="#code/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala" class="shortcut">StatsSampleOneMaster.scala</a>.
|
||||
To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
|
||||
To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
|
||||
in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
|
||||
</p>
|
||||
|
||||
|
|
@ -411,7 +411,7 @@ the <code>AdaptiveLoadBalancingPool</code> and <code>AdaptiveLoadBalancingGroup<
|
|||
|
||||
<p>
|
||||
You can read more about cluster metrics in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@
|
|||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-actor_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-testkit_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
|
|||
|
||||
<p>
|
||||
Read more about <code>become</code> in
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/lambda-actors.html#Become_Unbecome" target="_blank">the documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-actors.html#Become_Unbecome" target="_blank">the documentation</a>.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
|
@ -64,7 +64,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
|
|||
|
||||
<p>
|
||||
Read more about <code>akka.actor.FSM</code> in
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/lambda-fsm.html" target="_blank">the documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-fsm.html" target="_blank">the documentation</a>.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
|
|||
|
||||
<p>
|
||||
Read more about <code>become</code> in
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/actors.html#Become_Unbecome" target="_blank">the documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/actors.html#Become_Unbecome" target="_blank">the documentation</a>.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
|
@ -64,7 +64,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
|
|||
|
||||
<p>
|
||||
Read more about <code>akka.actor.FSM</code> in
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/fsm.html" target="_blank">the documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/fsm.html" target="_blank">the documentation</a>.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-actor_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package
|
|||
<code>sample.hello</code> and it further assumes that you have the required JAR files for
|
||||
<code>scala-library</code>, <code>typesafe-config</code> and <code>akka-actor</code> available.
|
||||
The easiest would be to manage these dependencies with a
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package
|
|||
<code>sample.hello</code> and it further assumes that you have the required JAR files for
|
||||
<code>scala-library</code>, <code>typesafe-config</code> and <code>akka-actor</code> available.
|
||||
The easiest would be to manage these dependencies with a
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ and test classes for illustrating multi-node testing with Akka.
|
|||
|
||||
<p>
|
||||
Please refer to the full documentation of
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
|
||||
and the closely related
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
|
||||
for details.
|
||||
There is also an section on
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
|
@ -79,7 +79,7 @@ the sbt prompt:
|
|||
|
||||
<p>
|
||||
The same test can be run on multiple machines as described in the
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
|
||||
</p>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>akka-sample-osgi-dining-hakkers-dist</artifactId>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>akka-sample-osgi-dining-hakkers</artifactId>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<akka.version>2.3-SNAPSHOT</akka.version>
|
||||
<akka.version>2.4-SNAPSHOT</akka.version>
|
||||
<karaf.version>2.3.1</karaf.version>
|
||||
<karaf.tooling.exam.version>${karaf.version}</karaf.tooling.exam.version>
|
||||
<netty.version>3.8.0.Final</netty.version>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains examples that illustrate a subset of
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/persistence.html" target="_blank">Akka Persistence</a> features.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html" target="_blank">Akka Persistence</a> features.
|
||||
</p>
|
||||
<ul>
|
||||
<li>Processors and channels</li>
|
||||
|
|
@ -63,7 +63,7 @@ messages to the processor.
|
|||
<h2>Eventsourced processors</h2>
|
||||
<p>
|
||||
<a href="#code/src/main/java/sample/persistence/EventsourcedExample.java" class="shortcut">EventsourcedExample.java</a>
|
||||
is described in detail in the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
is described in detail in the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
section of the user documentation. With every application run, the <code>ExampleProcessor</code> is recovered from
|
||||
events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
|
||||
current processor state to <code>stdout</code>.
|
||||
|
|
@ -91,7 +91,7 @@ To run this example, go to the <a href="#run" class="shortcut">Run</a> tab, and
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
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
|
||||
|
|
|
|||
|
|
@ -17,17 +17,17 @@
|
|||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-actor_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-persistence-experimental_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.typesafe.akka</groupId>
|
||||
<artifactId>akka-testkit_2.10</artifactId>
|
||||
<version>2.3-SNAPSHOT</version>
|
||||
<version>2.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div>
|
||||
<p>
|
||||
This tutorial contains examples that illustrate a subset of
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/persistence.html" target="_blank">Akka Persistence</a> features.
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html" target="_blank">Akka Persistence</a> features.
|
||||
</p>
|
||||
<ul>
|
||||
<li>Processors and channels</li>
|
||||
|
|
@ -82,7 +82,7 @@ messages to the processor.
|
|||
<h2>Eventsourced processors</h2>
|
||||
<p>
|
||||
<a href="#code/src/main/scala/sample/persistence/EventsourcedExample.scala" class="shortcut">EventsourcedExample.scala</a>
|
||||
is described in detail in the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
is described in detail in the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
section of the user documentation. With every application run, the <code>ExampleProcessor</code> is recovered from
|
||||
events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
|
||||
current processor state to <code>stdout</code>.
|
||||
|
|
@ -110,7 +110,7 @@ To run this example, go to the <a href="#run" class="shortcut">Run</a> tab, and
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<div>
|
||||
<p>
|
||||
In order to showcase the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/java/remoting.html" target="_blank">remote capabilities of Akka</a>
|
||||
In order to showcase the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/remoting.html" target="_blank">remote capabilities of Akka</a>
|
||||
we thought a remote calculator could do the trick.
|
||||
This sample demonstrates both remote deployment and look-up of remote actors.
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<div>
|
||||
<p>
|
||||
In order to showcase the <a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/remoting.html" target="_blank">remote capabilities of Akka</a>
|
||||
In order to showcase the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/remoting.html" target="_blank">remote capabilities of Akka</a>
|
||||
we thought a remote calculator could do the trick.
|
||||
This sample demonstrates both remote deployment and look-up of remote actors.
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue