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 10:20:00 UTC
[sling-org-apache-sling-testing-paxexam] 20/48: SLING-5898 Point to
the alternative repository if specified on the command-line
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 7f2a91ee8d2156b49866d9a7b6f5d88b51ec4c03
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jul 27 12:12:55 2016 +0000
SLING-5898 Point to the alternative repository if specified on the command-line
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754256 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 5cf2e3e..b1fdfa9 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -32,6 +32,7 @@ import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.when;
public abstract class TestSupport {
@@ -61,9 +62,13 @@ public abstract class TestSupport {
}
protected Option baseConfiguration() {
+ final String localRepository = System.getProperty("maven.repo.local", ""); // PAXEXAM-543
return composite(
- keepCaches(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ when(localRepository.length() > 0).useOptions(
+ systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepository)
+ ),
+ keepCaches(),
CoreOptions.workingDirectory(workingDirectory()),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.