Skip to content

Commit

Permalink
Update version for release 2.4.0-RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
patriknw committed Sep 4, 2015
1 parent b25e76e commit 30092b7
Show file tree
Hide file tree
Showing 57 changed files with 126 additions and 126 deletions.
4 changes: 2 additions & 2 deletions akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
import config._

getString("akka.version") should ===("2.4-SNAPSHOT")
settings.ConfigVersion should ===("2.4-SNAPSHOT")
getString("akka.version") should ===("2.4.0-RC2")
settings.ConfigVersion should ===("2.4.0-RC2")

getBoolean("akka.daemonic") should ===(false)

Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

akka {
# Akka version, checked against the runtime version of Akka.
version = "2.4-SNAPSHOT"
version = "2.4.0-RC2"

# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/scala/akka/actor/ActorSystem.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import java.util.Locale

object ActorSystem {

val Version: String = "2.4-SNAPSHOT"
val Version: String = "2.4.0-RC2"

val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
case null | "" | "." None
Expand Down
6 changes: 3 additions & 3 deletions akka-docs/rst/intro/deployment-scenarios.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ To start the application (on a unix-based system):
.. code-block:: none
cd target/universal/
unzip akka-sample-main-scala-2.4-SNAPSHOT.zip
chmod u+x akka-sample-main-scala-2.4-SNAPSHOT/bin/akka-sample-main-scala
akka-sample-main-scala-2.4-SNAPSHOT/bin/akka-sample-main-scala sample.hello.Main
unzip akka-sample-main-scala-2.4.0-RC2.zip
chmod u+x akka-sample-main-scala-2.4.0-RC2/bin/akka-sample-main-scala
akka-sample-main-scala-2.4.0-RC2/bin/akka-sample-main-scala sample.hello.Main
Use ``Ctrl-C`` to interrupt and exit the application.

Expand Down
2 changes: 1 addition & 1 deletion akka-kernel/src/main/dist/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Akka
====

This is the Akka 2.4-SNAPSHOT download.
This is the Akka 2.4.0-RC2 download.

Included are all libraries, documentation, and sources for Akka.

Expand Down
2 changes: 1 addition & 1 deletion akka-kernel/src/main/dist/config/application.conf
Original file line number Diff line number Diff line change
@@ -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.4-SNAPSHOT/
# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.4.0-RC2/
4 changes: 2 additions & 2 deletions akka-samples/akka-sample-camel-java/build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "akka-sample-camel-java"

version := "2.4-SNAPSHOT"
version := "2.4.0-RC2"

scalaVersion := "2.11.5"

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
"com.typesafe.akka" %% "akka-camel" % "2.4.0-RC2",
"org.apache.camel" % "camel-jetty" % "2.10.3",
"org.apache.camel" % "camel-quartz" % "2.10.3",
"org.slf4j" % "slf4j-api" % "1.7.2",
Expand Down
4 changes: 2 additions & 2 deletions akka-samples/akka-sample-camel-java/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<p>
This tutorial contains 3 samples of
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html" target="_blank">Akka Camel</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/camel.html" target="_blank">Akka Camel</a>.
</p>

<ul>
Expand All @@ -26,7 +26,7 @@ <h2>Asynchronous routing and transformation</h2>
<p>
This example demonstrates how to implement consumer and producer actors that
support
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html#Asynchronous_routing" target="_blank">
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/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*.
Expand Down
6 changes: 3 additions & 3 deletions akka-samples/akka-sample-camel-scala/build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name := "akka-sample-camel-scala"

version := "2.4-SNAPSHOT"
version := "2.4.0-RC2"

scalaVersion := "2.11.5"

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
"com.typesafe.akka" %% "akka-actor" % "2.4.0-RC2",
"com.typesafe.akka" %% "akka-camel" % "2.4.0-RC2",
"org.apache.camel" % "camel-jetty" % "2.10.3",
"org.apache.camel" % "camel-quartz" % "2.10.3",
"org.slf4j" % "slf4j-api" % "1.7.2",
Expand Down
4 changes: 2 additions & 2 deletions akka-samples/akka-sample-camel-scala/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<p>
This tutorial contains 3 samples of
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html" target="_blank">Akka Camel</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/camel.html" target="_blank">Akka Camel</a>.
</p>

<ul>
Expand All @@ -26,7 +26,7 @@ <h2>Asynchronous routing and transformation</h2>
<p>
This example demonstrates how to implement consumer and producer actors that
support
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html#Asynchronous_routing" target="_blank">
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/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*.
Expand Down
4 changes: 2 additions & 2 deletions akka-samples/akka-sample-cluster-java/build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import com.typesafe.sbt.SbtMultiJvm
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm

val akkaVersion = "2.4-SNAPSHOT"
val akkaVersion = "2.4.0-RC2"

val project = Project(
id = "akka-sample-cluster-java",
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-java",
version := "2.4-SNAPSHOT",
version := "2.4.0-RC2",
scalaVersion := "2.11.6",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
Expand Down
14 changes: 7 additions & 7 deletions akka-samples/akka-sample-cluster-java/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<p>
This tutorial contains 4 samples illustrating different
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
</p>
<ul>
<li>Subscribe to cluster membership events</li>
Expand Down Expand Up @@ -54,7 +54,7 @@ <h2>A Simple Cluster Example</h2>

<p>
You can read more about the cluster concepts in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/cluster-usage.html" target="_blank">documentation</a>.
</p>

<p>
Expand Down Expand Up @@ -143,7 +143,7 @@ <h2>Worker Dial-in Example</h2>
<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.4-SNAPSHOT/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
How can cluster membership events be used?
</p>

Expand Down Expand Up @@ -233,7 +233,7 @@ <h2>Worker Dial-in Example</h2>
<h2>Cluster Aware Routers</h2>

<p>
All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/routing.html" target="_blank">routers</a>
All <a href="http://doc.akka.io/docs/akka/2.4.0-RC2/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
Expand All @@ -244,7 +244,7 @@ <h2>Cluster Aware Routers</h2>

<p>
You can read more about cluster aware routers in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
</p>

<p>
Expand Down Expand Up @@ -346,7 +346,7 @@ <h2>Router Example with Pool of Remote Deployed Routees</h2>

<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.4-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.0-RC2/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
</p>

Expand Down Expand Up @@ -411,7 +411,7 @@ <h2>Adaptive Load Balancing</h2>

<p>
You can read more about cluster metrics in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
</p>

<p>
Expand Down
4 changes: 2 additions & 2 deletions akka-samples/akka-sample-cluster-scala/build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import com.typesafe.sbt.SbtMultiJvm
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm

val akkaVersion = "2.4-SNAPSHOT"
val akkaVersion = "2.4.0-RC2"

val project = Project(
id = "akka-sample-cluster-scala",
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-scala",
version := "2.4-SNAPSHOT",
version := "2.4.0-RC2",
scalaVersion := "2.11.6",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
Expand Down
14 changes: 7 additions & 7 deletions akka-samples/akka-sample-cluster-scala/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<p>
This tutorial contains 4 samples illustrating different
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
</p>
<ul>
<li>Subscribe to cluster membership events</li>
Expand Down Expand Up @@ -54,7 +54,7 @@ <h2>A Simple Cluster Example</h2>

<p>
You can read more about the cluster concepts in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/cluster-usage.html" target="_blank">documentation</a>.
</p>

<p>
Expand Down Expand Up @@ -143,7 +143,7 @@ <h2>Worker Dial-in Example</h2>
<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.4-SNAPSHOT/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
How can cluster membership events be used?
</p>

Expand Down Expand Up @@ -233,7 +233,7 @@ <h2>Worker Dial-in Example</h2>
<h2>Cluster Aware Routers</h2>

<p>
All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/routing.html" target="_blank">routers</a>
All <a href="http://doc.akka.io/docs/akka/2.4.0-RC2/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
Expand All @@ -244,7 +244,7 @@ <h2>Cluster Aware Routers</h2>

<p>
You can read more about cluster aware routers in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
</p>

<p>
Expand Down Expand Up @@ -345,7 +345,7 @@ <h2>Router Example with Pool of Remote Deployed Routees</h2>

<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.4-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.0-RC2/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
</p>

Expand Down Expand Up @@ -410,7 +410,7 @@ <h2>Adaptive Load Balancing</h2>

<p>
You can read more about cluster metrics in the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
</p>

<p>
Expand Down
6 changes: 3 additions & 3 deletions akka-samples/akka-sample-distributed-data-java/build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import com.typesafe.sbt.SbtMultiJvm
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm

val akkaVersion = "2.4-SNAPSHOT"
val akkaVersion = "2.4.0-RC2"

val project = Project(
id = "akka-sample-distributed-data-java",
base = file("."),
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-distributed-data-java",
version := "2.4-SNAPSHOT",
version := "2.4.0-RC2",
scalaVersion := "2.11.6",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"),
Expand Down Expand Up @@ -44,4 +44,4 @@ val project = Project(
) configs (MultiJvm)


fork in run := true
fork in run := true
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div>
<p>
This tutorial contains 5 samples illustrating how to use
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html" target="_blank">Akka Distributed Data</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html" target="_blank">Akka Distributed Data</a>.
</p>
<ul>
<li>Low Latency Voting Service</li>
Expand Down Expand Up @@ -47,7 +47,7 @@

<p>
Note that there are some
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Limitations" target="_blank">Limitations</a>
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Limitations" target="_blank">Limitations</a>
that you should be aware of. For example, Akka Distributed Data is not intended for <i>Big Data</i>.
</p>

Expand All @@ -71,7 +71,7 @@ <h2>Low Latency Voting Service</h2>
of the grand total number of votes. The actor is started on each cluster node. First it expects an
<code>OPEN</code> message on one or several nodes. After that the counting can begin. The open
signal is immediately replicated to all nodes with a boolean
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
Note <code>writeAll</code>.
</p>

Expand All @@ -94,7 +94,7 @@ <h2>Low Latency Voting Service</h2>

<p>
The counters are kept in a
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
and updated with:
</p>

Expand Down Expand Up @@ -139,7 +139,7 @@ <h2>Low Latency Voting Service</h2>

<p>
Read the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
documentation for more details of how to use <code>Get</code>, <code>Update</code>, and <code>Subscribe</code>.
</p>

Expand All @@ -165,7 +165,7 @@ <h2>Highly Available Shopping Cart</h2>

<p>
Each product in the cart is represented by a <code>LineItem</code> and all items in the cart
is collected in a <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Maps" target="_blank">LWWMap</a>.
is collected in a <a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Maps" target="_blank">LWWMap</a>.
</p>

<p>
Expand All @@ -187,7 +187,7 @@ <h2>Highly Available Shopping Cart</h2>

<p>
Read the
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Consistency" target="_blank">Consistency</a>
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Consistency" target="_blank">Consistency</a>
section in the documentation to understand the consistency considerations.
</p>

Expand Down Expand Up @@ -218,7 +218,7 @@ <h2>Distributed Service Registry</h2>

<p>
For each named service it is using an
<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Sets" target="_blank">ORSet</a>.
<a href="http://doc.akka.io/docs/akka/2.4.0-RC2/java/distributed-data.html#Sets" target="_blank">ORSet</a>.
Here we are using top level <code>ORSet</code> entries. An alternative would have been to use a
<code>ORMultiMap</code> holding all services. That would have a disadvantage if we have many services.
When a data entry is changed the full state of that entry is replicated to other nodes, i.e. when you
Expand Down
Loading

0 comments on commit 30092b7

Please sign in to comment.