svn commit: r1843606 - in /felix/trunk/systemready: pom.xml src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java

[cschneider]

Author: cschneider
Date: Thu Oct 11 21:33:08 2018
New Revision: 1843606

URL: http://svn.apache.org/viewvc?rev=1843606&view=rev
Log:
Add local repo config

Modified:
    felix/trunk/systemready/pom.xml
    
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java

Modified: felix/trunk/systemready/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/systemready/pom.xml?rev=1843606&r1=1843605&r2=1843606&view=diff
==============================================================================
--- felix/trunk/systemready/pom.xml (original)
+++ felix/trunk/systemready/pom.xml Thu Oct 11 21:33:08 2018
@@ -82,6 +82,14 @@
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
             </plugin>
+            <plugin>
+                   <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                           <systemPropertyVariables>
+                               
<org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
+                               </systemPropertyVariables>
+                       </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -174,6 +182,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+                   <artifactId>pax-url-aether</artifactId>
+                   <version>2.5.4</version>
+               </dependency>
+
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>5.6.10</version>

Modified: 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java?rev=1843606&r1=1843605&r2=1843606&view=diff
==============================================================================
--- 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java
 (original)
+++ 
felix/trunk/systemready/src/test/java/org/apache/felix/systemready/osgi/util/BaseTest.java
 Thu Oct 11 21:33:08 2018
@@ -21,7 +21,6 @@ package org.apache.felix.systemready.osg
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
 
@@ -58,16 +57,17 @@ public class BaseTest {
     @Inject
     public ServiceComponentRuntime scr;
 
-    
-
     public Option baseConfiguration() {
+       String localRepo = System.getProperty("maven.repo.local");
+        if (localRepo != null) {
+            System.setProperty("org.ops4j.pax.url.mvn.localRepository", 
localRepo);
+        }
         return CoreOptions.composite(
                        
                 systemProperty("pax.exam.invoker").value("junit"),
                 systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
                 systemProperty("logback.configurationFile")
                     .value("src/test/resources/logback.xml"),
-                localRepo(),
                 
mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.6"),
                 
mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").version("1.0.13"),
                 
mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").version("1.0.13"),
@@ -86,12 +86,9 @@ public class BaseTest {
     }
     
     protected static OptionalCompositeOption localRepo() {
-        String localRepo = System.getProperty("maven.repo.local");
-        if (localRepo == null) {
-            localRepo = 
System.getProperty("org.ops4j.pax.url.mvn.localRepository");
-        }
-        return when(localRepo != null)
-            .useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + 
localRepo));
+        String localRepo = System.getProperty("maven.repo.local", "");
+        return when(localRepo.length() > 0)
+               
.useOptions(systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo));
     }
     
     public Option servicesCheckConfig(StateType type, String... services) {