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

Merge branch 'master' of github.com:akka/akka

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2012-03-22 16:24:03 +01:00
commit f7ca01a26b
105 changed files with 3239 additions and 4290 deletions
Download patch file Download diff file Expand all files Collapse all files

16
project/AkkaBuild.scala
View file

@ -32,7 +32,7 @@ object AkkaBuild extends Build {
Unidoc.unidocExclude := Seq(samples.id, tutorials.id),
Dist.distExclude := Seq(actorTests.id, akkaSbtPlugin.id, docs.id)
),
aggregate = Seq(actor, testkit, actorTests, remote, cluster, slf4j, agent, transactor, mailboxes, zeroMQ, kernel, akkaSbtPlugin, actorMigration, samples, tutorials, docs)
aggregate = Seq(actor, testkit, actorTests, remote, camel, cluster, slf4j, agent, transactor, mailboxes, zeroMQ, kernel, akkaSbtPlugin, actorMigration, samples, tutorials, docs)
)
lazy val actor = Project(
@ -239,6 +239,15 @@ object AkkaBuild extends Build {
libraryDependencies ++= Dependencies.kernel
)
)
lazy val camel = Project(
id = "akka-camel",
base = file("akka-camel"),
dependencies = Seq(actor, slf4j, testkit % "test->test"),
settings = defaultSettings ++ Seq(
libraryDependencies ++= Dependencies.camel
)
)
lazy val actorMigration = Project(
id = "akka-actor-migration",
@ -251,7 +260,8 @@ object AkkaBuild extends Build {
id = "akka-sbt-plugin",
base = file("akka-sbt-plugin"),
settings = defaultSettings ++ Seq(
sbtPlugin := true
sbtPlugin := true,
scalaVersion := "2.9.1"
)
)
@ -465,6 +475,8 @@ object Dependencies {
val kernel = Seq(Test.scalatest, Test.junit)
val camel = Seq(Test.scalatest, Test.junit, Test.mockito, camelCore)
// TODO: resolve Jetty version conflict
// val sampleCamel = Seq(camelCore, camelSpring, commonsCodec, Runtime.camelJms, Runtime.activemq, Runtime.springJms,
// Test.junit, Test.scalatest, Test.logback)