karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: Update itests to correctly use the maven.local.repo
Date Wed, 12 Jul 2017 15:59:50 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 0da059e5b -> b8219e307


Update itests to correctly use the maven.local.repo


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b8219e30
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b8219e30
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b8219e30

Branch: refs/heads/master
Commit: b8219e307e5dfcfce360579fa594336914a0ba26
Parents: 0da059e
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jul 12 17:53:29 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jul 12 17:53:29 2017 +0200

----------------------------------------------------------------------
 itests/pom.xml                                                  | 5 ++---
 .../src/test/java/org/apache/karaf/itests/KarafTestSupport.java | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/b8219e30/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index b853169..68c4618 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -305,10 +305,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/b8219e30/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 9e7b9b2..93941fb 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -204,6 +204,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/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")),


Mime
View raw message