You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/07/13 07:02:12 UTC
karaf git commit: Correctly use maven.local.repo in itests
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x 8fd6f4a3e -> c0469349c
Correctly use maven.local.repo in itests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c0469349
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c0469349
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c0469349
Branch: refs/heads/karaf-4.1.x
Commit: c0469349c80bc4ff578632ac2081d0366b175ec8
Parents: 8fd6f4a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jul 13 09:01:34 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jul 13 09:02:03 2017 +0200
----------------------------------------------------------------------
itests/pom.xml | 5 ++---
.../src/test/java/org/apache/karaf/itests/KarafTestSupport.java | 5 +++++
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c0469349/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index a87db91..a309282 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -249,10 +249,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- when the local repo location has been specified, we need to pass on this information to PAX mvn url -->
- <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
<systemPropertyVariables>
- <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<spring31.version>${spring31.version}</spring31.version>
<spring32.version>${spring32.version}</spring32.version>
<spring40.version>${spring40.version}</spring40.version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c0469349/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 747f670..e13de17 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -188,6 +188,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),
@@ -202,6 +206,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", 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")),