[karaf] branch karaf-4.0.x updated: [KARAF-5585] Do not provide maven settings to pax url if they are gone.

[ldywicki]

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch karaf-4.0.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.0.x by this push:
     new 002718d  [KARAF-5585] Do not provide maven settings to pax url if they 
are gone.
002718d is described below

commit 002718dfe7f1f7c67c86b0e526ad1182b278298c
Author: Łukasz Dywicki <l...@code-house.org>
AuthorDate: Wed Jan 31 14:01:42 2018 +0100

    [KARAF-5585] Do not provide maven settings to pax url if they are gone.
---
 .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java        | 6 +++++-
 .../src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java | 8 --------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
index 5d8c2a7..c9da133 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
@@ -169,7 +169,11 @@ public class VerifyMojo extends MojoSupport {
         getLog().info("Using repositories: " + remote.toString());
         config.put("maven.repositories", remote.toString());
         config.put("maven.localRepository", localRepo.getBasedir());
-        config.put("maven.settings", 
mavenSession.getRequest().getUserSettingsFile().toString());
+
+        if (mavenSession.getRequest().getUserSettingsFile().exists()) {
+            config.put("maven.settings", 
mavenSession.getRequest().getUserSettingsFile().toString());
+        }
+
         // TODO: add more configuration bits ?
         resolver = MavenResolvers.createMavenResolver(config, "maven");
         doExecute();
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 a77d8cd..6794f8b 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
@@ -129,14 +129,6 @@ public abstract class MojoSupport extends AbstractMojo {
     // 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,

-- 
To stop receiving notification emails like this one, please contact
ldywi...@apache.org.