summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-11 18:10:00 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-11 18:10:00 -0800
commitd2cee3a5e1d26ba27fd7912d48b1e7af0beb844a (patch)
tree3b29e473bdaba629b8be2d45f8d12a15ed05380d /test
parent7ecfce1fb8d39275f082aaa3ad4dc0eee197391c (diff)
parenta24e7fa688cad6bd12d8541a76b5e0b04291a070 (diff)
downloadscala-d2cee3a5e1d26ba27fd7912d48b1e7af0beb844a.tar.gz
scala-d2cee3a5e1d26ba27fd7912d48b1e7af0beb844a.tar.bz2
scala-d2cee3a5e1d26ba27fd7912d48b1e7af0beb844a.zip
Merge pull request #3114 from adriaanm/to-m6
M6 modules, partest depends on scala as provided.
Diffstat (limited to 'test')
-rw-r--r--test/osgi/src/ScalaOsgiHelper.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/osgi/src/ScalaOsgiHelper.scala b/test/osgi/src/ScalaOsgiHelper.scala
index bcdc5c0df1..7b14cf20e8 100644
--- a/test/osgi/src/ScalaOsgiHelper.scala
+++ b/test/osgi/src/ScalaOsgiHelper.scala
@@ -21,6 +21,8 @@ trait ScalaOsgiHelper {
def standardOptions: Array[exam.Option] = {
val bundles = (allBundleFiles map makeBundle)
bundles ++ Array[exam.Option](felix(), equinox(), 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] = {