From 15f6a6f901a93edc21dc8b4f64fe06bcedba9de3 Mon Sep 17 00:00:00 2001 From: abayer Date: Fri, 17 Sep 2010 15:37:07 +0000 Subject: [PATCH] [HUDSON-4693] Systematized Maven alternate settings logic - consistent in both POM parsing and actual Maven command line. Current behavior as of this change: - If project.getAlternateSettings() is absolute, just use the absolute path - this may not actually work through the configuration UI, but I put it in to be safe. - else, if project.getAlternateSettings() exists in getWorkspace(), use that - else, if project.getAlternateSettings() exists in getModuleRoot(), use that - else null - don't use an alternate settings location git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@34950 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/maven/MavenModuleSetBuild.java | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 62388062e3..41ca43b725 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -455,7 +455,16 @@ public class MavenModuleSetBuild extends AbstractMavenBuild