From 5eabce8db762e7c98a923f33d3506a7d86f35d2d Mon Sep 17 00:00:00 2001 From: imod Date: Wed, 26 Sep 2012 20:32:18 +0200 Subject: [PATCH] use path returned by SettingsProvider --- .../hudson/maven/MavenModuleSetBuild.java | 90 +++++-------------- 1 file changed, 22 insertions(+), 68 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index bf2a22550f..d195e52d2f 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -34,8 +34,6 @@ import hudson.maven.MavenBuild.ProxyImpl2; import hudson.maven.reporters.MavenAggregatedArtifactRecord; import hudson.maven.reporters.MavenFingerprinter; import hudson.maven.reporters.MavenMailer; -import hudson.maven.settings.SettingConfig; -import hudson.maven.settings.SettingsProviderUtils; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Build; @@ -186,7 +184,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild proxies; protected Result doRun(final BuildListener listener) throws Exception { - + Result r = null; PrintStream logger = listener.getLogger(); FilePath remoteSettings = null, remoteGlobalSettings = null; @@ -583,7 +581,10 @@ public class MavenModuleSetBuild extends AbstractMavenBuild(); @@ -724,14 +689,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild argInterceptors = this.getBuild().getActions(MavenArgumentInterceptorAction.class); @@ -846,18 +804,14 @@ public class MavenModuleSetBuild extends AbstractMavenBuild