You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/07/13 05:07:35 UTC
karaf git commit: [build] Works with and without -Dmaven.repo.local
Repository: karaf
Updated Branches:
refs/heads/master b8219e307 -> 87e785bf6
[build] Works with and without -Dmaven.repo.local
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/87e785bf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/87e785bf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/87e785bf
Branch: refs/heads/master
Commit: 87e785bf62ebbeb4fce867f1e84b5c7c80853122
Parents: b8219e3
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Thu Jul 13 07:07:21 2017 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Thu Jul 13 07:07:21 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/karaf/itests/KarafTestSupport.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/87e785bf/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index 93941fb..97dee6f 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -187,6 +187,10 @@ public class KarafTestSupport {
String rmiRegistryPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_RMI_REG_PORT), Integer.parseInt(MAX_RMI_REG_PORT)));
String rmiServerPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_RMI_SERVER_PORT), Integer.parseInt(MAX_RMI_SERVER_PORT)));
String sshPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_SSH_PORT), Integer.parseInt(MAX_SSH_PORT)));
+ String localRepository = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+ if (localRepository == null) {
+ localRepository = "";
+ }
return new Option[]{
//KarafDistributionOption.debugConfiguration("8889", true),
@@ -204,7 +208,7 @@ public class KarafTestSupport {
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", sshPort),
- editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.localRepository", System.getProperty("org.ops4j.pax.url.mvn.localRepository")),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.localRepository", localRepository),
editConfigurationFilePut("etc/system.properties", "spring31.version", System.getProperty("spring31.version")),
editConfigurationFilePut("etc/system.properties", "spring32.version", System.getProperty("spring32.version")),
editConfigurationFilePut("etc/system.properties", "spring40.version", System.getProperty("spring40.version")),