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:39:39 UTC
[sling-org-apache-sling-hc-it] 09/37: SLING-2953 - Healthcheck
pax-exam setup does not check for maven.repo.local
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.hc.it-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hc-it.git
commit dbe3dd46ec4aa20c40fdbe015d26c2841b88e1e6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jul 9 07:21:43 2013 +0000
SLING-2953 - Healthcheck pax-exam setup does not check for
maven.repo.local
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/healthcheck/it@1501114 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/java/org/apache/sling/hc/it/core/U.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/test/java/org/apache/sling/hc/it/core/U.java b/src/test/java/org/apache/sling/hc/it/core/U.java
index 2e90b52..49bb523 100644
--- a/src/test/java/org/apache/sling/hc/it/core/U.java
+++ b/src/test/java/org/apache/sling/hc/it/core/U.java
@@ -22,6 +22,8 @@ import static org.ops4j.pax.exam.CoreOptions.junitBundles;
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)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.