raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #16700 from akka/wip-16684-scala-2.11.5-samples-patriknw

Browse source 
=sam #16684 Change to scala 2.11.5 in samples
This commit is contained in:
Patrik Nordwall 2015-01-22 16:10:06 +01:00
commit 0c42971758
24 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-samples/akka-docs-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-docs-java-lambda"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
compileOrder := CompileOrder.ScalaThenJava compileOrder := CompileOrder.ScalaThenJava

4
akka-samples/akka-docs-java-lambda/pom.xml
View file

@ -16,12 +16,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.10</artifactId> <artifactId>akka-testkit_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
akka-samples/akka-docs-udp-multicast/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-docs-udp-multicast"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
compileOrder := CompileOrder.ScalaThenJava compileOrder := CompileOrder.ScalaThenJava

2
akka-samples/akka-sample-camel-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-camel-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-camel-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-camel-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-fsm-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-docs-java-lambda"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")

4
akka-samples/akka-sample-fsm-java-lambda/pom.xml
View file

@ -16,12 +16,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.10</artifactId> <artifactId>akka-testkit_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
akka-samples/akka-sample-fsm-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-fsm-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-main-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-java-lambda/pom.xml
View file

@ -16,7 +16,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
akka-samples/akka-sample-main-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-main-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-main-java/pom.xml
View file

@ -16,7 +16,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
akka-samples/akka-sample-main-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-main-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-multi-node-scala/build.sbt
View file

@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq( settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-multi-node-scala", name := "akka-sample-multi-node-scala",
version := "2.4-SNAPSHOT", version := "2.4-SNAPSHOT",
scalaVersion := "2.10.4", scalaVersion := "2.11.5",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion, "com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-remote" % akkaVersion, "com.typesafe.akka" %% "akka-remote" % akkaVersion,

8
akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
View file

@ -17,10 +17,10 @@
<paxexam.version>2.6.0</paxexam.version> <paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version> <paxswissbox.version>1.6.0</paxswissbox.version>
<protobuf.version>2.5.0</protobuf.version> <protobuf.version>2.5.0</protobuf.version>
<scala.version>2.10.4</scala.version> <scala.version>2.11.5</scala.version>
<scala.dep.version>2.10</scala.dep.version> <scala.dep.version>2.11</scala.dep.version>
<scalatest.version>2.0</scalatest.version> <scalatest.version>2.2.3</scalatest.version>
<typesafe.config.version>1.2.0</typesafe.config.version> <typesafe.config.version>1.2.1</typesafe.config.version>
<leveldb.version>0.7</leveldb.version> <leveldb.version>0.7</leveldb.version>
<leveldbjni.version>1.7</leveldbjni.version> <leveldbjni.version>1.7</leveldbjni.version>
<uncommons-maths.version>1.2.2</uncommons-maths.version> <uncommons-maths.version>1.2.2</uncommons-maths.version>

2
akka-samples/akka-sample-persistence-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")

6
akka-samples/akka-sample-persistence-java-lambda/pom.xml
View file

@ -16,17 +16,17 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence-experimental_2.10</artifactId> <artifactId>akka-persistence-experimental_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.10</artifactId> <artifactId>akka-testkit_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
akka-samples/akka-sample-persistence-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT" "com.typesafe.akka" %% "akka-persistence-experimental" % "2.4-SNAPSHOT"

2
akka-samples/akka-sample-persistence-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-persistence-scala"
version := "2.3-SNAPSHOT" version := "2.3-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-remote-java/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-remote-java"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-remote-scala/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-sample-remote-scala"
version := "2.4-SNAPSHOT" version := "2.4-SNAPSHOT"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT", "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",

2
akka-samples/akka-sample-supervision-java-lambda/build.sbt
View file

@ -2,7 +2,7 @@ name := "akka-supervision-java-lambda"
version := "1.0" version := "1.0"
scalaVersion := "2.10.4" scalaVersion := "2.11.5"
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")

4
akka-samples/akka-sample-supervision-java-lambda/pom.xml
View file

@ -16,12 +16,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.10</artifactId> <artifactId>akka-testkit_2.11</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

3
project/AkkaBuild.scala
View file

@ -188,9 +188,10 @@ object AkkaBuild extends Build {
id = "akka-samples", id = "akka-samples",
base = file("akka-samples"), base = file("akka-samples"),
settings = parentSettings ++ ActivatorDist.settings, settings = parentSettings ++ ActivatorDist.settings,
// FIXME osgiDiningHakkersSampleMavenTest temporarily removed from aggregate due to #16703
aggregate = if (!CommandLineOptions.aggregateSamples) Nil else aggregate = if (!CommandLineOptions.aggregateSamples) Nil else
Seq(sampleCamelJava, sampleCamelScala, sampleClusterJava, sampleClusterScala, sampleFsmScala, Seq(sampleCamelJava, sampleCamelScala, sampleClusterJava, sampleClusterScala, sampleFsmScala,
sampleHelloKernel, sampleMainJava, sampleMainScala, sampleMultiNodeScala, osgiDiningHakkersSampleMavenTest, sampleHelloKernel, sampleMainJava, sampleMainScala, sampleMultiNodeScala,
samplePersistenceJava, samplePersistenceScala, sampleRemoteJava, sampleRemoteScala) samplePersistenceJava, samplePersistenceScala, sampleRemoteJava, sampleRemoteScala)
) )