You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/03/17 16:17:18 UTC
git commit: Added missing Maven local repo configuration
Repository: jclouds-karaf
Updated Branches:
refs/heads/do17x 756b0dde5 -> 76bb0550c
Added missing Maven local repo configuration
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/76bb0550
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/76bb0550
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/76bb0550
Branch: refs/heads/do17x
Commit: 76bb0550c455f37e9c336d4a288096191779a69d
Parents: 756b0dd
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Mar 17 16:17:06 2014 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Mar 17 16:17:06 2014 +0100
----------------------------------------------------------------------
.../jclouds/karaf/itests/JcloudsKarafTestSupport.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/76bb0550/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
index 2182ce4..1d0d3d7 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
@@ -39,6 +39,7 @@ import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.ProbeBuilder;
+import org.ops4j.pax.exam.options.DefaultCompositeOption;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -86,9 +87,16 @@ public class JcloudsKarafTestSupport {
* @return
*/
protected Option jcloudsDistributionConfiguration() {
- return karafDistributionConfiguration().frameworkUrl(
- maven().groupId(KARAF_GROUP_ID).artifactId(KARAF_ARTIFACT_ID).versionAsInProject().type("tar.gz"))
- .karafVersion(getKarafVersion()).name("Apache Karaf Distro").unpackDirectory(new File("target/paxexam/unpack/"));
+ return new DefaultCompositeOption(karafDistributionConfiguration()
+ .frameworkUrl(maven()
+ .groupId(KARAF_GROUP_ID)
+ .artifactId(KARAF_ARTIFACT_ID)
+ .versionAsInProject().type("tar.gz"))
+ .karafVersion(getKarafVersion()).name("Apache Karaf Distro")
+ .unpackDirectory(new File("target/paxexam/unpack/")),
+ // We use this option to allow the container to use artifacts found in a private repo.
+ editConfigurationFileExtend("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",", file:${maven.local.repo}@id=mavenlocalrepo@snapshots")
+ );
}
/**