You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:25:23 UTC

[sling-org-apache-sling-crankstart-launcher] 26/31: Use org.ops4j.pax.url.mvn.localRepository to point to the same local repository that this build uses

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.crankstart.launcher-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-crankstart-launcher.git

commit 48408210bfb5ca49184b79748156e0a07f5f47fd
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Aug 6 08:41:59 2014 +0000

    Use org.ops4j.pax.url.mvn.localRepository to point to the same local repository that this build uses
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/crankstart/launcher@1616128 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                    | 12 +++++++++++-
 src/test/resources/launcher-test.crank.txt |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a91660d..84f0979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>   
 
diff --git a/src/test/resources/launcher-test.crank.txt b/src/test/resources/launcher-test.crank.txt
index 179d4dd..981be3b 100644
--- a/src/test/resources/launcher-test.crank.txt
+++ b/src/test/resources/launcher-test.crank.txt
@@ -23,7 +23,7 @@ bundle mvn:org.apache.felix/org.apache.felix.http.jetty/${felix.http.jetty.versi
 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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.