Merge branch 'master' into wip-comet

2010-02-12 18:48:34 +01:00 · 2010-02-12 18:48:34 +01:00 · 5fa544c975
commit 5fa544c975
parent 1cc11ee18d d99526f12d
29 changed files with 29 additions and 29 deletions
--- a/akka-amqp/pom.xml
+++ b/akka-amqp/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-cluster/akka-cluster-jgroups/pom.xml
+++ b/akka-cluster/akka-cluster-jgroups/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-cluster-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-cluster/akka-cluster-shoal/pom.xml
+++ b/akka-cluster/akka-cluster-shoal/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-cluster-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-cluster/akka-cluster-tribes/pom.xml
+++ b/akka-cluster/akka-cluster-tribes/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-cluster-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-cluster/pom.xml
+++ b/akka-cluster/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <modules>
--- a/akka-comet/pom.xml
+++ b/akka-comet/pom.xml
@ -11,7 +11,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <!-- Core deps -->
--- a/akka-core/pom.xml
+++ b/akka-core/pom.xml
@ -11,7 +11,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <!-- Core deps -->
--- a/akka-fun-test-java/pom.xml
+++ b/akka-fun-test-java/pom.xml
@ -11,7 +11,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-kernel/pom.xml
+++ b/akka-kernel/pom.xml
@ -11,7 +11,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <!-- akka deps -->
--- a/akka-persistence/akka-persistence-cassandra/pom.xml
+++ b/akka-persistence/akka-persistence-cassandra/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-persistence-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-persistence/akka-persistence-common/pom.xml
+++ b/akka-persistence/akka-persistence-common/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-persistence-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-persistence/akka-persistence-mongo/pom.xml
+++ b/akka-persistence/akka-persistence-mongo/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-persistence-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-persistence/akka-persistence-redis/pom.xml
+++ b/akka-persistence/akka-persistence-redis/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-persistence-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-persistence/pom.xml
+++ b/akka-persistence/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <modules>
--- a/akka-rest/pom.xml
+++ b/akka-rest/pom.xml
@ -11,7 +11,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <!-- Core deps -->
--- a/akka-samples/akka-sample-chat/pom.xml
+++ b/akka-samples/akka-sample-chat/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-samples-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <build>
--- a/akka-samples/akka-sample-lift/config/akka.conf
+++ b/akka-samples/akka-sample-lift/config/akka.conf
@ -15,7 +15,7 @@
 </log>

 <akka>
-  version = "0.6"
+  version = "0.7-SNAPSHOT"

  <actor>
    timeout = 5000              # default timeout for future based invocations
--- a/akka-samples/akka-sample-lift/pom.xml
+++ b/akka-samples/akka-sample-lift/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-samples-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <properties>
--- a/akka-samples/akka-sample-rest-java/pom.xml
+++ b/akka-samples/akka-sample-rest-java/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-samples-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <build>
--- a/akka-samples/akka-sample-rest-scala/pom.xml
+++ b/akka-samples/akka-sample-rest-scala/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-samples-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-samples/akka-sample-security/pom.xml
+++ b/akka-samples/akka-sample-security/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka-samples-parent</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-samples/akka-sample-security/src/main/resources/akka.conf
+++ b/akka-samples/akka-sample-security/src/main/resources/akka.conf
@ -6,7 +6,7 @@
 # Modify as needed.
 
 <akka>
-  version = "0.6"
+  version = "0.7-SNAPSHOT"
  
  boot = ["se.scalablesolutions.akka.security.samples.Boot"] # FQN to the class doing initial active object/actor
                                                   # supervisor bootstrap, should be defined in default constructor
--- a/akka-samples/pom.xml
+++ b/akka-samples/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <modules>
--- a/akka-security/pom.xml
+++ b/akka-security/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-util-java/pom.xml
+++ b/akka-util-java/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-util/pom.xml
+++ b/akka-util/pom.xml
@ -10,7 +10,7 @@
  <parent>
    <artifactId>akka</artifactId>
    <groupId>se.scalablesolutions.akka</groupId>
-    <version>0.6</version>
+    <version>0.7-SNAPSHOT</version>
  </parent>

  <dependencies>
--- a/akka-util/src/main/scala/Config.scala
+++ b/akka-util/src/main/scala/Config.scala
@ -12,7 +12,7 @@ import net.lag.configgy.{Configgy, ParseException}
 * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
 */
 object Config extends Logging {
-  val VERSION = "0.6"
+  val VERSION = "0.7-SNAPSHOT"

  // Set Multiverse options for max speed
  System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false")
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@ -15,7 +15,7 @@
 </log>
 
 <akka>
-  version = "0.6"
+  version = "0.7-SNAPSHOT"
 
  # FQN to the class doing initial active object/actor
  # supervisor bootstrap, should be defined in default constructor
--- a/pom.xml
+++ b/pom.xml
@ -7,7 +7,7 @@
  <name>Akka Project</name>
  <artifactId>akka</artifactId>
  <groupId>se.scalablesolutions.akka</groupId>
-  <version>0.6</version>
+  <version>0.7-SNAPSHOT</version>
  <inceptionYear>2009</inceptionYear>
  <url>http://akkasource.org</url>
  <packaging>pom</packaging>