diff options
author | RafaĆ Krzewski <rafal.krzewski@caltha.pl> | 2014-10-15 04:17:04 +0200 |
---|---|---|
committer | Simon Ochsenreither <simon@ochsenreither.de> | 2014-10-23 05:12:43 +0200 |
commit | 3ddb3737568ea5e9fa5803c36c3a95feae265330 (patch) | |
tree | a029f5314003fe1a93c9d50494b3acfa1d85c0ae /test/osgi/src/ScalaOsgiHelper.scala | |
parent | 2b5df373638d08204b71258928289f6b39e25d5f (diff) | |
download | scala-3ddb3737568ea5e9fa5803c36c3a95feae265330.tar.gz scala-3ddb3737568ea5e9fa5803c36c3a95feae265330.tar.bz2 scala-3ddb3737568ea5e9fa5803c36c3a95feae265330.zip |
SI-8927 Update OSGi stuff to get rid of bndlib warning
The way the desired OSGi frameworks are chosen has changed between
Pax Exam versions:
On earlier versions, specifying it in code was fine, but PAX Exam 4.x
runs the tests on the first OSGi framework it finds on classpath.
An exclusion for the transitive dependency org.osgi.core was added,
because it seems that artifact has broken dependecies (which would
have brought us back to square one).
Good thing is that it isn't needed here, because the OSGi framework JARs
contain all necessary classes.
Diffstat (limited to 'test/osgi/src/ScalaOsgiHelper.scala')
-rw-r--r-- | test/osgi/src/ScalaOsgiHelper.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/osgi/src/ScalaOsgiHelper.scala b/test/osgi/src/ScalaOsgiHelper.scala index 084afe8643..7ba8883bb8 100644 --- a/test/osgi/src/ScalaOsgiHelper.scala +++ b/test/osgi/src/ScalaOsgiHelper.scala @@ -20,19 +20,19 @@ trait ScalaOsgiHelper { def standardOptions: Array[exam.Option] = { val bundles = (allBundleFiles map makeBundle) - bundles ++ Array[exam.Option](felix(), equinox(), junitBundles()) + bundles ++ Array[exam.Option](junitBundles()) // to change the local repo used (for some operations, but not all -- which is why I didn't bother): // systemProperty("org.ops4j.pax.url.mvn.localRepository").value(sys.props("maven.repo.local"))) } def justReflectionOptions: Array[exam.Option] = { val bundles = filteredBundleFiles("scala-library", "scala-reflect") - bundles ++ Array[exam.Option](felix(), equinox(), junitBundles()) + bundles ++ Array[exam.Option](junitBundles()) } def justCoreLibraryOptions: Array[exam.Option] = { val bundles = filteredBundleFiles("scala-library") - bundles ++ Array[exam.Option](felix(), equinox(), junitBundles()) + bundles ++ Array[exam.Option](junitBundles()) } } |