From f40f596e2aeeef369fa2a9643405ebce32186b2f Mon Sep 17 00:00:00 2001 From: imod Date: Wed, 26 Sep 2012 19:53:12 +0200 Subject: [PATCH] change MavenUtil to use new EP to get settings.xml --- maven-plugin/src/main/java/hudson/maven/MavenUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java index 65d2a266d6..9aadc16742 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java @@ -31,6 +31,7 @@ import hudson.model.AbstractProject; import hudson.model.BuildListener; import jenkins.model.Jenkins; import hudson.model.TaskListener; +import hudson.mvn.SettingsProvider; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.Maven.ProjectWithMaven; @@ -99,7 +100,8 @@ public class MavenUtil { m = ((ProjectWithMaven) project).inferMavenInstallation().forNode(Jenkins.getInstance(),listener); } if (project instanceof MavenModuleSet) { - String altSet = ((MavenModuleSet) project).getAlternateSettings(); + String altSet = SettingsProvider.getRemotePath(((MavenModuleSet) project).getSettings(), build, listener); + settingsLoc = (altSet == null) ? null : new File(build.getWorkspace().child(altSet).getRemote());