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 2016/02/17 17:27:36 UTC

[1/2] karaf git commit: KARAF-4288 - pass custom settings.xml onto pax-url-aether

Repository: karaf
Updated Branches:
  refs/heads/master 4d05d52a5 -> 7afcdb6c7


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/8d576504
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8d576504
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8d576504

Branch: refs/heads/master
Commit: 8d5765046602adbc36de4fadb8c88882fb421bd1
Parents: bc9b83b
Author: Stuart McCulloch <mc...@gmail.com>
Authored: Thu Jan 21 15:06:50 2016 +0000
Committer: Stuart McCulloch <mc...@gmail.com>
Committed: Thu Jan 21 15:06:50 2016 +0000

----------------------------------------------------------------------
 .../org/apache/karaf/tooling/utils/MojoSupport.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/8d576504/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;


[2/2] karaf git commit: Merge branch 'KARAF-4288-support-custom-settings-xml' of https://github.com/mcculls/karaf

Posted by jb...@apache.org.
Merge branch 'KARAF-4288-support-custom-settings-xml' of https://github.com/mcculls/karaf


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

Branch: refs/heads/master
Commit: 7afcdb6c7c14fe5120867ec785db12dba7d90d91
Parents: 4d05d52 8d57650
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Feb 17 17:11:43 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Feb 17 17:11:43 2016 +0100

----------------------------------------------------------------------
 .../org/apache/karaf/tooling/utils/MojoSupport.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------