Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 177072e2e -> 7be920094
KARAF-4288 - pass custom settings.xml onto pax-url-aether Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7be92009 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7be92009 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7be92009 Branch: refs/heads/karaf-4.0.x Commit: 7be9200948ca1aef661244ffc1372f5902f03a14 Parents: 177072e Author: Stuart McCulloch <[email protected]> Authored: Thu Jan 21 15:06:50 2016 +0000 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Feb 17 17:28:32 2016 +0100 ---------------------------------------------------------------------- .../org/apache/karaf/tooling/utils/MojoSupport.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/7be92009/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java index 9648da1..24a5fef 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java @@ -125,6 +125,19 @@ public abstract class MojoSupport extends AbstractMojo { return projectHelper; } + // called by Plexus when injecting the mojo's session + public void setMavenSession(MavenSession mavenSession) { + this.mavenSession = mavenSession; + + if (mavenSession != null) { + // check for custom settings.xml and pass it onto pax-url-aether + File settingsFile = mavenSession.getRequest().getUserSettingsFile(); + if (settingsFile != null && settingsFile.isFile()) { + System.setProperty("org.ops4j.pax.url.mvn.settings", settingsFile.getPath()); + } + } + } + protected Map createManagedVersionMap(String projectId, DependencyManagement dependencyManagement) throws ProjectBuildingException { Map map;
