From 950d19a377eb38225cb76c6e6322c9d98df50291 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 14 Mar 2013 16:48:23 +0100
Subject: [PATCH]  #3153 - 'Fixing' the ByteStringSpec by not having it
 generate now illegal combinations of data for copyToArray

---
 akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala | 2 +-
 akka-sbt-plugin/sample/project/Build.scala                     | 2 +-
 project/AkkaBuild.scala                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index 117de28242..6f94770dcc 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -39,7 +39,7 @@ class ByteStringSpec extends WordSpec with MustMatchers with Checkers {
   implicit val arbitraryByteStringSlice: Arbitrary[ByteStringSlice] = Arbitrary {
     for {
       xs ← arbitraryByteString.arbitrary
-      from ← choose(0, xs.length)
+      from ← choose(0, xs.length - 1)
       until ← choose(from, xs.length)
     } yield (xs, from, until)
   }
diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala
index c4c37dde1b..7c505d9125 100644
--- a/akka-sbt-plugin/sample/project/Build.scala
+++ b/akka-sbt-plugin/sample/project/Build.scala
@@ -7,7 +7,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
 object HelloKernelBuild extends Build {
   val Organization = "akka.sample"
   val Version      = "2.2-SNAPSHOT"
-  val ScalaVersion = "2.10.0"
+  val ScalaVersion = "2.10.1"
 
   lazy val HelloKernel = Project(
     id = "hello-kernel",
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index eb9a9fc117..7974cc6951 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -39,7 +39,7 @@ object AkkaBuild extends Build {
     organization := "com.typesafe.akka",
     version      := "2.2-SNAPSHOT",
     // Also change ScalaVersion in akka-sbt-plugin/sample/project/Build.scala
-    scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0")
+    scalaVersion := System.getProperty("akka.scalaVersion", "2.10.1")
   )
 
   lazy val akka = Project(