Repository: aries-rsa Updated Branches: refs/heads/master d0e395eb8 -> 8b3b86533
Add local repo for ci build Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/8b3b8653 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/8b3b8653 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/8b3b8653 Branch: refs/heads/master Commit: 8b3b865333ccd493c6a91f6b7a2cc7432c0791aa Parents: d0e395e Author: Christian Schneider <[email protected]> Authored: Sun Mar 13 11:20:04 2016 +0100 Committer: Christian Schneider <[email protected]> Committed: Sun Mar 13 11:20:04 2016 +0100 ---------------------------------------------------------------------- itests/felix/pom.xml | 28 ++++++++++++++++++++ .../rsa/itests/felix/TestDiscoveryExport.java | 10 +++++-- 2 files changed, 36 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/8b3b8653/itests/felix/pom.xml ---------------------------------------------------------------------- diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml index 578cf69..c76dbe4 100644 --- a/itests/felix/pom.xml +++ b/itests/felix/pom.xml @@ -136,4 +136,32 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>ci-build-profile</id> + <activation> + <property> + <name>maven.repo.local</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <!-- + 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> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/8b3b8653/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TestDiscoveryExport.java ---------------------------------------------------------------------- diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TestDiscoveryExport.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TestDiscoveryExport.java index 12f8402..389c88a 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TestDiscoveryExport.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TestDiscoveryExport.java @@ -21,6 +21,8 @@ package org.apache.aries.rsa.itests.felix; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import static org.ops4j.pax.exam.CoreOptions.vmOption; +import static org.ops4j.pax.exam.CoreOptions.when; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -36,7 +38,6 @@ import javax.inject.Inject; import org.apache.aries.rsa.discovery.endpoint.EndpointDescriptionParser; import org.apache.aries.rsa.discovery.endpoint.PropertiesMapper; import org.apache.aries.rsa.itests.tcp.api.EchoService; -import org.apache.aries.rsa.provider.tcp.TCPProvider; import org.apache.aries.rsa.spi.DistributionProvider; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -77,6 +78,11 @@ public class TestDiscoveryExport { @Configuration public static Option[] configure() throws Exception { + String localRepo = System.getProperty("maven.repo.local"); + + if (localRepo == null) { + localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); + } return new Option[] { CoreOptions.junitBundles(), systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), @@ -90,7 +96,7 @@ public class TestDiscoveryExport { mavenBundle().groupId("org.apache.aries.rsa.discovery").artifactId("zookeeper").versionAsInProject(), mavenBundle().groupId("org.apache.aries.rsa.discovery").artifactId("zookeeper-server").versionAsInProject(), mavenBundle().groupId("org.apache.aries.rsa.itests").artifactId("testbundle-tcp-service").versionAsInProject(), -// + when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005") }; }
