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

Merge branch 'master' into wip-2.9.0

Browse source
This commit is contained in:
Peter Vlugter 2011-03-28 20:23:37 +13:00
commit 93b92dd71f
10 changed files with 464 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

7
project/build/AkkaProject.scala
View file

@ -345,6 +345,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val junit = Dependencies.junit
val scalatest = Dependencies.scalatest
lazy val networkTestsEnabled = systemOptional[Boolean]("akka.test.network", false)
override def testOptions = super.testOptions ++ {
if (!networkTestsEnabled.value) Seq(TestFilter(test => !test.endsWith("NetworkTest")))
else Seq.empty
}
override def bndImportPackage = "javax.transaction;version=1.1" :: super.bndImportPackage.toList
}