diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-11 17:43:56 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-11 18:31:24 -0800 |
| commit | ec89b597172e951fa0cb5c30a38c8f73c3ccc750 (patch) | |
| tree | dc1e9962bae74aa1e10c5b6421ffc11b5ef1e0d1 /build.xml | |
| parent | 732fd26b33438c0e897bb91de4fb562a79f07095 (diff) | |
| download | scala-ec89b597172e951fa0cb5c30a38c8f73c3ccc750.tar.gz scala-ec89b597172e951fa0cb5c30a38c8f73c3ccc750.tar.bz2 scala-ec89b597172e951fa0cb5c30a38c8f73c3ccc750.zip | |
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.
Also, upgrade STARR because Jenkins is using `skip.locker` now.
See https://groups.google.com/d/msg/scala-internals/7R-Y5txP8NI/DX_JWFO2fu4J
for a discussion of the problem this should fix.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -219,12 +219,14 @@ TODO: </artifact:dependencies> <!-- Pax runner --> - <property name="pax.exam.version" value="2.5.0"/> + <property name="pax.exam.version" value="2.6.0"/> <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset"> <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/> <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/> <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/> - <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/> + <!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217 + https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... --> + <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/> <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/> <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/> |