diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index a80c5ac175..7b6f46700d 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -204,6 +204,14 @@ public abstract class AbstractBuild

,R extends Abs return n.createPath(workspace); } + /** + * Normally, a workspace is assigned by {@link Runner}, but this lets you set the workspace in case + * {@link AbstractBuild} is created without a build. + */ + protected void setWorkspace(FilePath ws) { + this.workspace = ws.getRemote(); + } + /** * Returns the root directory of the checked-out module. *

diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 241b619c02..c50faf0b6a 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -24,19 +24,13 @@ package hudson.maven; import hudson.FilePath; -import hudson.Util; import hudson.EnvVars; import hudson.slaves.WorkspaceList; import hudson.slaves.WorkspaceList.Lease; import hudson.maven.agent.AbortException; -import hudson.model.AbstractBuild; -import hudson.model.AbstractProject; import hudson.model.BuildListener; -import hudson.model.DependencyGraph; -import hudson.model.Hudson; import hudson.model.Result; import hudson.model.Run; -import hudson.model.Cause.UpstreamCause; import hudson.model.Environment; import hudson.model.TaskListener; import hudson.model.Node; @@ -66,10 +60,8 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; /** * {@link Run} for {@link MavenModule}. @@ -231,6 +223,13 @@ public class MavenBuild extends AbstractMavenBuild { return new ExecutedMojo.Cache(); } + /** + * Backdoor for {@link MavenModuleSetBuild} to assign workspaces for modules. + */ + protected void setWorkspace(FilePath path) { + super.setWorkspace(path); + } + /** * Runs Maven and builds the project. */ diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index fb904e6978..95961b28b3 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -427,8 +427,10 @@ public class MavenModuleSetBuild extends AbstractMavenBuild