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

Merge branch 'master' of git-proxy:jboner/akka into rpc_amqp

Browse source
This commit is contained in:
momania 2010-08-11 15:30:01 +02:00
commit 6b8e20d599
11 changed files with 359 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

14
project/build/AkkaProject.scala
View file

@ -75,6 +75,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val multiverseModuleConfig = ModuleConfiguration("org.multiverse", CodehausSnapshotRepo)
lazy val nettyModuleConfig = ModuleConfiguration("org.jboss.netty", JBossRepo)
lazy val scalaTestModuleConfig = ModuleConfiguration("org.scalatest", ScalaToolsSnapshots)
lazy val logbackModuleConfig = ModuleConfiguration("ch.qos.logback",sbt.DefaultMavenRepository)
lazy val embeddedRepo = EmbeddedRepo // This is the only exception, because the embedded repo is fast!
// -------------------------------------------------------------------------------------------------------------------
@ -91,7 +92,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val LIFT_VERSION = "2.1-M1"
lazy val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
lazy val SCALATEST_VERSION = "1.2-for-scala-2.8.0.final-SNAPSHOT"
lazy val Slf4jVersion = "1.6.0"
lazy val LOGBACK_VERSION = "0.9.24"
lazy val SPRING_VERSION = "3.0.3.RELEASE"
lazy val WerkzVersion = "2.2.1"
@ -187,8 +188,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val sjson = "sjson.json" % "sjson" % "0.7-2.8.0" % "compile"
lazy val slf4j = "org.slf4j" % "slf4j-api" % Slf4jVersion % "compile"
lazy val slf4j_log4j = "org.slf4j" % "slf4j-log4j12" % Slf4jVersion % "compile"
lazy val logback = "ch.qos.logback" % "logback-classic" % LOGBACK_VERSION % "compile"
lazy val logback_core = "ch.qos.logback" % "logback-core" % LOGBACK_VERSION % "compile"
lazy val spring_beans = "org.springframework" % "spring-beans" % SPRING_VERSION % "compile"
lazy val spring_context = "org.springframework" % "spring-context" % SPRING_VERSION % "compile"
@ -265,7 +266,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
" dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version)
)
// Exclude slf4j1.5.11 from the classpath, it's conflicting...
//FIXME STILL NEEDED? => Exclude slf4j1.5.11 from the classpath, it's conflicting...
override def runClasspath = super.runClasspath +++
descendents(info.projectPath / "config", "*") ---
(super.runClasspath ** "slf4j*1.5.11.jar")
@ -348,9 +349,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val sjson = Dependencies.sjson
val werkz = Dependencies.werkz
val werkz_core = Dependencies.werkz_core
val slf4j = Dependencies.slf4j
val slf4j_log4j = Dependencies.slf4j_log4j
val log4j = Dependencies.log4j
val logback = Dependencies.logback
val logback_core = Dependencies.logback_core
// testing
val junit = Dependencies.junit