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

OSGi work: Switched to bnd4sbt 1.0.0.RC3, using projectVersion for exported packages now and fixed a merge bug.

Browse source
This commit is contained in:
Heiko Seeberger 2010-06-21 18:40:15 +02:00
parent bd057616b3
commit 54b48a3d6d
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
project/build/AkkaProject.scala
View file

@ -21,7 +21,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
val CASSANDRA_VERSION = "0.6.1" val CASSANDRA_VERSION = "0.6.1"
val LIFT_VERSION = "2.0-scala280-SNAPSHOT" val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
val SCALATEST_VERSION = "1.2-for-scala-2.8.0.RC3-SNAPSHOT" 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 COMMONS_CODEC_VERSION = "1.4"
val MULTIVERSE_VERSION = "0.6-SNAPSHOT" val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
@ -69,12 +68,9 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
val grizzlyModuleConfig = ModuleConfiguration("com.sun.grizzly", javaNetRepo) val grizzlyModuleConfig = ModuleConfiguration("com.sun.grizzly", javaNetRepo)
// val atmosphereModuleConfig = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo) // val atmosphereModuleConfig = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo)
val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots) val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
<<<<<<< HEAD // val scalaBundleConfig = ModuleConfiguration("com.weiglewilczek.scala-lang-osgi", ScalaToolsReleases)
val scalaBundleConfig = ModuleConfiguration("com.weiglewilczek.scala-lang-osgi", ScalaToolsReleases)
=======
def codehausSnapshotRepo = "Codehaus Snapshots" at "http://snapshots.repository.codehaus.org" def codehausSnapshotRepo = "Codehaus Snapshots" at "http://snapshots.repository.codehaus.org"
val multiverseModuleConfig = ModuleConfiguration("org.multiverse", codehausSnapshotRepo) val multiverseModuleConfig = ModuleConfiguration("org.multiverse", codehausSnapshotRepo)
>>>>>>> master
// ------------------------------------------------------------ // ------------------------------------------------------------
// project defintions // project defintions
@ -528,8 +524,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
trait OSGiProject extends DefaultProject with BNDPlugin { trait OSGiProject extends DefaultProject with BNDPlugin {
override def artifactID = moduleID + "_osgi" override def artifactID = moduleID + "_osgi"
override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=0.9") override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=%s".format(projectVersion.value))
} }
} }

2
project/plugins/Plugins.scala
View file

@ -6,5 +6,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
// val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/" // val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/"
// val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT" // val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT"
val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC2" val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC3"
} }