Author: rombert
Date: Tue Jul 9 07:21:43 2013
New Revision: 1501114
URL: http://svn.apache.org/r1501114
Log:
SLING-2953 - Healthcheck pax-exam setup does not check for
maven.repo.local
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1501114&r1=1501113&r2=1501114&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Tue Jul 9 07:21:43 2013
@@ -22,6 +22,8 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.IOException;
import java.io.StringReader;
@@ -37,9 +39,13 @@ public class U {
static Option[] config(boolean includeRules) {
final String coreVersion = System.getProperty("sling.hc.core.version");
+ String localRepo = System.getProperty("maven.repo.local", "");
if(includeRules) {
return options(
+ when(localRepo.length() > 0).useOptions(
+
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+ ),
junitBundles(),
provision(
mavenBundle("org.apache.sling",
"org.apache.sling.hc.core", coreVersion),
@@ -48,6 +54,9 @@ public class U {
);
} else {
return options(
+ when(localRepo.length() > 0).useOptions(
+
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+ ),
junitBundles(),
provision(
mavenBundle("org.apache.sling",
"org.apache.sling.hc.core", coreVersion)
