Skip to content

Commit ec89b59

Browse files
committed
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.
1 parent 732fd26 commit ec89b59

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

build.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,14 @@ TODO:
219219
</artifact:dependencies>
220220

221221
<!-- Pax runner -->
222-
<property name="pax.exam.version" value="2.5.0"/>
222+
<property name="pax.exam.version" value="2.6.0"/>
223223
<artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
224224
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
225225
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
226226
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
227-
<dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/>
227+
<!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
228+
https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
229+
<dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
228230
<dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
229231
<dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
230232
<dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>

starr.number

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
starr.version=2.10.1
1+
starr.version=2.10.3
2+
starr.use.released=1

0 commit comments

Comments
 (0)