From 08ffba62461f925218f9ea7465530da1976fb0a0 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 22 Jan 2015 09:49:36 +0100 Subject: [PATCH] =sam #16684 Change to scala 2.11.5 in samples --- akka-samples/akka-docs-java-lambda/build.sbt | 2 +- akka-samples/akka-docs-java-lambda/pom.xml | 4 ++-- akka-samples/akka-docs-udp-multicast/build.sbt | 2 +- akka-samples/akka-sample-camel-java/build.sbt | 2 +- akka-samples/akka-sample-camel-scala/build.sbt | 2 +- akka-samples/akka-sample-fsm-java-lambda/build.sbt | 2 +- akka-samples/akka-sample-fsm-java-lambda/pom.xml | 4 ++-- akka-samples/akka-sample-fsm-scala/build.sbt | 2 +- akka-samples/akka-sample-main-java-lambda/build.sbt | 2 +- akka-samples/akka-sample-main-java-lambda/pom.xml | 2 +- akka-samples/akka-sample-main-java/build.sbt | 2 +- akka-samples/akka-sample-main-java/pom.xml | 2 +- akka-samples/akka-sample-main-scala/build.sbt | 2 +- akka-samples/akka-sample-multi-node-scala/build.sbt | 2 +- akka-samples/akka-sample-osgi-dining-hakkers/pom.xml | 8 ++++---- .../akka-sample-persistence-java-lambda/build.sbt | 2 +- akka-samples/akka-sample-persistence-java-lambda/pom.xml | 6 +++--- akka-samples/akka-sample-persistence-java/build.sbt | 2 +- akka-samples/akka-sample-persistence-scala/build.sbt | 2 +- akka-samples/akka-sample-remote-java/build.sbt | 2 +- akka-samples/akka-sample-remote-scala/build.sbt | 2 +- .../akka-sample-supervision-java-lambda/build.sbt | 2 +- akka-samples/akka-sample-supervision-java-lambda/pom.xml | 4 ++-- 23 files changed, 31 insertions(+), 31 deletions(-) diff --git a/akka-samples/akka-docs-java-lambda/build.sbt b/akka-samples/akka-docs-java-lambda/build.sbt index 60e1f5a40f..c1a7ebbc5f 100644 --- a/akka-samples/akka-docs-java-lambda/build.sbt +++ b/akka-samples/akka-docs-java-lambda/build.sbt @@ -2,7 +2,7 @@ name := "akka-docs-java-lambda" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" compileOrder := CompileOrder.ScalaThenJava diff --git a/akka-samples/akka-docs-java-lambda/pom.xml b/akka-samples/akka-docs-java-lambda/pom.xml index 4a2b5028a4..599ef9ebbb 100644 --- a/akka-samples/akka-docs-java-lambda/pom.xml +++ b/akka-samples/akka-docs-java-lambda/pom.xml @@ -16,12 +16,12 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT com.typesafe.akka - akka-testkit_2.10 + akka-testkit_2.11 2.4-SNAPSHOT diff --git a/akka-samples/akka-docs-udp-multicast/build.sbt b/akka-samples/akka-docs-udp-multicast/build.sbt index 359cb8ecd6..f01ecc5913 100644 --- a/akka-samples/akka-docs-udp-multicast/build.sbt +++ b/akka-samples/akka-docs-udp-multicast/build.sbt @@ -2,7 +2,7 @@ name := "akka-docs-udp-multicast" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" compileOrder := CompileOrder.ScalaThenJava diff --git a/akka-samples/akka-sample-camel-java/build.sbt b/akka-samples/akka-sample-camel-java/build.sbt index 8974318caf..a325cb121d 100644 --- a/akka-samples/akka-sample-camel-java/build.sbt +++ b/akka-samples/akka-sample-camel-java/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-camel-java" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT", diff --git a/akka-samples/akka-sample-camel-scala/build.sbt b/akka-samples/akka-sample-camel-scala/build.sbt index 8793ab8ab2..5bf2a48ebf 100644 --- a/akka-samples/akka-sample-camel-scala/build.sbt +++ b/akka-samples/akka-sample-camel-scala/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-camel-scala" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", diff --git a/akka-samples/akka-sample-fsm-java-lambda/build.sbt b/akka-samples/akka-sample-fsm-java-lambda/build.sbt index 890d2758cd..26bb0271b3 100644 --- a/akka-samples/akka-sample-fsm-java-lambda/build.sbt +++ b/akka-samples/akka-sample-fsm-java-lambda/build.sbt @@ -2,7 +2,7 @@ name := "akka-docs-java-lambda" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") diff --git a/akka-samples/akka-sample-fsm-java-lambda/pom.xml b/akka-samples/akka-sample-fsm-java-lambda/pom.xml index f0194415c4..9284c5c36e 100644 --- a/akka-samples/akka-sample-fsm-java-lambda/pom.xml +++ b/akka-samples/akka-sample-fsm-java-lambda/pom.xml @@ -16,12 +16,12 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT com.typesafe.akka - akka-testkit_2.10 + akka-testkit_2.11 2.4-SNAPSHOT diff --git a/akka-samples/akka-sample-fsm-scala/build.sbt b/akka-samples/akka-sample-fsm-scala/build.sbt index 07e58a8235..8a5645e631 100644 --- a/akka-samples/akka-sample-fsm-scala/build.sbt +++ b/akka-samples/akka-sample-fsm-scala/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-fsm-scala" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" diff --git a/akka-samples/akka-sample-main-java-lambda/build.sbt b/akka-samples/akka-sample-main-java-lambda/build.sbt index d6c1c4997d..4ebab98512 100644 --- a/akka-samples/akka-sample-main-java-lambda/build.sbt +++ b/akka-samples/akka-sample-main-java-lambda/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-main-java-lambda" version := "1.0" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" diff --git a/akka-samples/akka-sample-main-java-lambda/pom.xml b/akka-samples/akka-sample-main-java-lambda/pom.xml index 4209674d57..eae724100a 100644 --- a/akka-samples/akka-sample-main-java-lambda/pom.xml +++ b/akka-samples/akka-sample-main-java-lambda/pom.xml @@ -16,7 +16,7 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT diff --git a/akka-samples/akka-sample-main-java/build.sbt b/akka-samples/akka-sample-main-java/build.sbt index 6faa4607e1..4abc426989 100644 --- a/akka-samples/akka-sample-main-java/build.sbt +++ b/akka-samples/akka-sample-main-java/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-main-java" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "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 88629eb3b8..8989612185 100644 --- a/akka-samples/akka-sample-main-java/pom.xml +++ b/akka-samples/akka-sample-main-java/pom.xml @@ -16,7 +16,7 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT diff --git a/akka-samples/akka-sample-main-scala/build.sbt b/akka-samples/akka-sample-main-scala/build.sbt index b80d8fa363..d23a5ac271 100644 --- a/akka-samples/akka-sample-main-scala/build.sbt +++ b/akka-samples/akka-sample-main-scala/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-main-scala" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" diff --git a/akka-samples/akka-sample-multi-node-scala/build.sbt b/akka-samples/akka-sample-multi-node-scala/build.sbt index 929411c3d1..2b0e528770 100644 --- a/akka-samples/akka-sample-multi-node-scala/build.sbt +++ b/akka-samples/akka-sample-multi-node-scala/build.sbt @@ -9,7 +9,7 @@ val project = Project( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( name := "akka-sample-multi-node-scala", version := "2.4-SNAPSHOT", - scalaVersion := "2.10.4", + scalaVersion := "2.11.5", libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % akkaVersion, "com.typesafe.akka" %% "akka-remote" % akkaVersion, diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml index aafa2df34e..cad80b2d6f 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml +++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml @@ -17,10 +17,10 @@ 2.6.0 1.6.0 2.5.0 - 2.10.4 - 2.10 - 2.0 - 1.2.0 + 2.11.5 + 2.11 + 2.2.3 + 1.2.1 0.7 1.7 1.2.2 diff --git a/akka-samples/akka-sample-persistence-java-lambda/build.sbt b/akka-samples/akka-sample-persistence-java-lambda/build.sbt index fe8d952b2e..d5f81b571d 100644 --- a/akka-samples/akka-sample-persistence-java-lambda/build.sbt +++ b/akka-samples/akka-sample-persistence-java-lambda/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-persistence-java-lambda" version := "1.0" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") diff --git a/akka-samples/akka-sample-persistence-java-lambda/pom.xml b/akka-samples/akka-sample-persistence-java-lambda/pom.xml index e4e2007c3c..30497d04be 100644 --- a/akka-samples/akka-sample-persistence-java-lambda/pom.xml +++ b/akka-samples/akka-sample-persistence-java-lambda/pom.xml @@ -16,17 +16,17 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT com.typesafe.akka - akka-persistence-experimental_2.10 + akka-persistence-experimental_2.11 2.4-SNAPSHOT com.typesafe.akka - akka-testkit_2.10 + akka-testkit_2.11 2.4-SNAPSHOT diff --git a/akka-samples/akka-sample-persistence-java/build.sbt b/akka-samples/akka-sample-persistence-java/build.sbt index 70593488c5..ca639bd7f6 100644 --- a/akka-samples/akka-sample-persistence-java/build.sbt +++ b/akka-samples/akka-sample-persistence-java/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-persistence-java" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT" diff --git a/akka-samples/akka-sample-persistence-scala/build.sbt b/akka-samples/akka-sample-persistence-scala/build.sbt index f5e5fd949b..eaea91e20a 100644 --- a/akka-samples/akka-sample-persistence-scala/build.sbt +++ b/akka-samples/akka-sample-persistence-scala/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-persistence-scala" version := "2.3-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", diff --git a/akka-samples/akka-sample-remote-java/build.sbt b/akka-samples/akka-sample-remote-java/build.sbt index b31870d6d4..2c1f17d377 100644 --- a/akka-samples/akka-sample-remote-java/build.sbt +++ b/akka-samples/akka-sample-remote-java/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-remote-java" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", diff --git a/akka-samples/akka-sample-remote-scala/build.sbt b/akka-samples/akka-sample-remote-scala/build.sbt index dee4dfda69..0ee710a383 100644 --- a/akka-samples/akka-sample-remote-scala/build.sbt +++ b/akka-samples/akka-sample-remote-scala/build.sbt @@ -2,7 +2,7 @@ name := "akka-sample-remote-scala" version := "2.4-SNAPSHOT" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt index 05e77d0d71..f114d4369e 100644 --- a/akka-samples/akka-sample-supervision-java-lambda/build.sbt +++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt @@ -2,7 +2,7 @@ name := "akka-supervision-java-lambda" version := "1.0" -scalaVersion := "2.10.4" +scalaVersion := "2.11.5" javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml index 5d67f0dcb0..462739c6f6 100644 --- a/akka-samples/akka-sample-supervision-java-lambda/pom.xml +++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml @@ -16,12 +16,12 @@ com.typesafe.akka - akka-actor_2.10 + akka-actor_2.11 2.4-SNAPSHOT com.typesafe.akka - akka-testkit_2.10 + akka-testkit_2.11 2.4-SNAPSHOT