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

Merge branch 'master' into osgi

Browse source 
Conflicts:
	project/build/AkkaProject.scala
This commit is contained in:
Heiko Seeberger 2010-06-21 16:32:25 +02:00
commit bd057616b3
63 changed files with 1180 additions and 1733 deletions
Download patch file Download diff file Expand all files Collapse all files

7
project/build/AkkaProject.scala
View file

@ -23,6 +23,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
val SCALATEST_VERSION = "1.2-for-scala-2.8.0.RC3-SNAPSHOT"
val MULTIVERSE_VERSION = "0.5.2"
val COMMONS_CODEC_VERSION = "1.4"
val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
// ------------------------------------------------------------
lazy val deployPath = info.projectPath / "deploy"
@ -68,7 +69,12 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
val grizzlyModuleConfig = ModuleConfiguration("com.sun.grizzly", javaNetRepo)
// val atmosphereModuleConfig = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo)
val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
<<<<<<< HEAD
val scalaBundleConfig = ModuleConfiguration("com.weiglewilczek.scala-lang-osgi", ScalaToolsReleases)
=======
def codehausSnapshotRepo = "Codehaus Snapshots" at "http://snapshots.repository.codehaus.org"
val multiverseModuleConfig = ModuleConfiguration("org.multiverse", codehausSnapshotRepo)
>>>>>>> master
// ------------------------------------------------------------
// project defintions
@ -179,6 +185,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
// subprojects
class AkkaCoreProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val netty = "org.jboss.netty" % "netty" % "3.2.0.CR1" % "compile"
val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
val commons_io = "commons-io" % "commons-io" % "1.4" % "compile"
val dispatch_json = "net.databinder" % "dispatch-json_2.8.0.RC3" % "0.7.4" % "compile"
val dispatch_htdisttp = "net.databinder" % "dispatch-http_2.8.0.RC3" % "0.7.4" % "compile"