Author: bdelacretaz
Date: Wed Aug 6 08:41:59 2014
New Revision: 1616128
URL: http://svn.apache.org/r1616128
Log:
Use org.ops4j.pax.url.mvn.localRepository to point to the same local repository
that this build uses
Modified:
sling/trunk/contrib/crankstart/core/pom.xml
sling/trunk/contrib/crankstart/launcher/pom.xml
sling/trunk/contrib/crankstart/launcher/src/test/resources/launcher-test.crank.txt
Modified: sling/trunk/contrib/crankstart/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/core/pom.xml?rev=1616128&r1=1616127&r2=1616128&view=diff
==============================================================================
--- sling/trunk/contrib/crankstart/core/pom.xml (original)
+++ sling/trunk/contrib/crankstart/core/pom.xml Wed Aug 6 08:41:59 2014
@@ -23,7 +23,7 @@
</description>
<properties>
- <pax.url.version>1.6.0</pax.url.version>
+ <pax.url.version>2.1.0</pax.url.version>
<test.storage.base>${project.build.directory}</test.storage.base>
</properties>
Modified: sling/trunk/contrib/crankstart/launcher/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/pom.xml?rev=1616128&r1=1616127&r2=1616128&view=diff
==============================================================================
--- sling/trunk/contrib/crankstart/launcher/pom.xml (original)
+++ sling/trunk/contrib/crankstart/launcher/pom.xml Wed Aug 6 08:41:59 2014
@@ -23,7 +23,7 @@
</description>
<properties>
- <pax.url.version>1.6.0</pax.url.version>
+ <pax.url.version>2.1.0</pax.url.version>
</properties>
<build>
@@ -81,6 +81,16 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <!-- pax url needs the local Maven repository to find
snapshots we just built -->
+
<org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}/</org.ops4j.pax.url.mvn.localRepository>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
sling/trunk/contrib/crankstart/launcher/src/test/resources/launcher-test.crank.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/launcher-test.crank.txt?rev=1616128&r1=1616127&r2=1616128&view=diff
==============================================================================
---
sling/trunk/contrib/crankstart/launcher/src/test/resources/launcher-test.crank.txt
(original)
+++
sling/trunk/contrib/crankstart/launcher/src/test/resources/launcher-test.crank.txt
Wed Aug 6 08:41:59 2014
@@ -23,7 +23,7 @@ bundle mvn:org.apache.felix/org.apache.f
bundle mvn:org.apache.felix/org.apache.felix.eventadmin/1.3.2
bundle mvn:org.apache.felix/org.apache.felix.scr/1.8.2
bundle mvn:org.apache.felix/org.apache.felix.metatype/1.0.10
-bundle mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.1-SNAPSHOT
+bundle mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.0
bundle mvn:org.apache.sling/org.apache.sling.commons.log/2.1.2
bundle mvn:org.apache.felix/org.apache.felix.configadmin/1.6.0
bundle mvn:org.apache.felix/org.apache.felix.webconsole/3.1.6
