From 65c5b0d6d43caeca3620df061285acc8fa1a938c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 12 Aug 2009 22:12:20 +0000 Subject: [PATCH] [FIXED HUDSON-4192] in 1.320. The core wasn't setting the workspace for MavenBuild, leaving it empty. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20635 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/model/AbstractBuild.java | 8 ++++ .../main/java/hudson/maven/MavenBuild.java | 15 ++++---- .../hudson/maven/MavenModuleSetBuild.java | 6 ++- .../resources/hudson/maven/HUDSON-4192.zip | Bin 0 -> 2117 bytes .../hudson/maven/MavenBuildTest.java | 35 ++++++++++++++++++ 5 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 test/src/test/resources/hudson/maven/HUDSON-4192.zip create mode 100644 test/src/test/resources/hudson/maven/MavenBuildTest.java 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 AbstractMavenBuildP) zhPJiWZ55^*I)8ZI483hC4-Z8sX>^+hn%q6n)Bb&u(CMW=+G9)nA2u$zKlh?!HG)7*vnm{=Blna$oWd_G3+3aw6aK^Sv&aeE(&~Lgl$DQo1@Pah{r4=)m#! zjKhW1?^xo+KbKrc4P0}(@}lWGF`K56srN3od6lj;nE%|QKvsQ5?W30~pXE=>uVV}V z1}qmaU>U#x3uZtG7GS^@7bWXs4OQIQIHB4~Qj1GS)ys#hH!HC$kyHbOF$}=(3`CMz zR8zW#516DXfJsUoyD5$Z1tCCB>46-EHBf2;5BeQ8;Mx0JyXKA7#d|kXGs^jLY8-G{0!kybG#*Zse8f4ITVQ9QL&c|kNgKlKWZ5n|7{8GCoGr${8uP<5 z<2J|U<-aDS2c8W*WVS$U-t*i!oU_hIZJfF3BwP($*k~w0=VLaNXj1KXv}G z@%kT5*fC&(a5)PRwx~r4a@YoAHx0FbA<~_wfwq|$;!bGRBGL@hKzomD1|@-J nz=Gr$A_EOIlOYFM8FteUSq{astZbkJ%mswcfr0J83gQ6(!{}fZ literal 0 HcmV?d00001 diff --git a/test/src/test/resources/hudson/maven/MavenBuildTest.java b/test/src/test/resources/hudson/maven/MavenBuildTest.java new file mode 100644 index 0000000000..437f006f96 --- /dev/null +++ b/test/src/test/resources/hudson/maven/MavenBuildTest.java @@ -0,0 +1,35 @@ +package hudson.maven; + +import org.jvnet.hudson.test.HudsonTestCase; +import org.jvnet.hudson.test.Bug; +import org.jvnet.hudson.test.ExtractResourceSCM; +import hudson.Launcher; +import hudson.model.BuildListener; + +import java.io.IOException; + +/** + * @author Kohsuke Kawaguchi + */ +public class MavenBuildTest extends HudsonTestCase { + /** + * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}. + */ + @Bug(4192) + public void testMavenRun() throws Exception { + configureDefaultMaven(); + MavenModuleSet m = createMavenProject(); + m.getReporters().add(new TestReporter()); + m.setScm(new ExtractResourceSCM(getClass().getResource("HUDSON-4192.zip"))); + assertBuildStatusSuccess(m.scheduleBuild2(0).get()); + } + + private static class TestReporter extends MavenReporter { + @Override + public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + assertNotNull(build.getProject().getWorkspace()); + assertNotNull(build.getWorkspace()); + return true; + } + } +}