summaryrefslogtreecommitdiff
path: root/test/osgi
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-09 12:53:10 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-11 16:55:24 -0800
commita24e7fa688cad6bd12d8541a76b5e0b04291a070 (patch)
tree3b29e473bdaba629b8be2d45f8d12a15ed05380d /test/osgi
parent7ecfce1fb8d39275f082aaa3ad4dc0eee197391c (diff)
downloadscala-a24e7fa688cad6bd12d8541a76b5e0b04291a070.tar.gz
scala-a24e7fa688cad6bd12d8541a76b5e0b04291a070.tar.bz2
scala-a24e7fa688cad6bd12d8541a76b5e0b04291a070.zip
M6 modules, partest depends on scala as provided.
The new partest now marks its scala dependencies as provided. This is much more robust than before, and it breaks ugly cycles. Updated the build for partest-extras to provide the required scala-compiler dependency. Also, upgrade pax-url-aether to 1.6.0. Since our jenkins uses mirrors with passwords, we needed a fix for https://ops4j1.jira.com/browse/PAXURL-217 in order to run osgi.test on jenkins, now that we use maven more. We didn't hit this bug before because we were using a standard location for the maven local repository, but that causes problems with concurrent jenkins jobs accessing it. So, I added the following to `~/.m2/settings`, and then ran into the issue described above. Also removed some non-essential uses of the extra-repo (slows stuff down), and added a comment of how to make the osgi tests look in a certain local m2 repo (for /some/ operations...) ``` <!-- Maven repos are not safe for concurrent access, thus give each job its own. The WORKSPACE env var is set by jenkins to the path of the current job's workspace. This settings file will cause ant/maven to break if WORKSPACE is not set (to a writeable directory). I don't know how to encode a fall back, but I assume it's not needed as this is ~jenkins/.m2/settings.xml --> <localRepository>${WORKSPACE}/m2repo</localRepository> ```
Diffstat (limited to 'test/osgi')
-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] = {