diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index dc5b5fc3ee..aeb19f7d48 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -362,6 +362,7 @@ public class Maven extends Builder { */ public static final int MAVEN_20 = 0; public static final int MAVEN_21 = 1; + public static final int MAVEN_30 = 2; /** diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 5a580cac39..e8b7b225fb 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -394,9 +394,13 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { * Returns the older default Maven, while still allowing specification of other bundled Mavens. */ protected MavenInstallation configureDefaultMaven() throws Exception { - return configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_20); + return configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_20); } + protected MavenInstallation configureMaven3() throws Exception { + return configureDefaultMaven("apache-maven-3.0.1", MavenInstallation.MAVEN_30); + } + /** * Locates Maven2 and configure that as the only Maven in the system. */ diff --git a/test/src/test/java/hudson/maven/Maven3BuildTest.java b/test/src/test/java/hudson/maven/Maven3BuildTest.java new file mode 100644 index 0000000000..f9d5f5c0b2 --- /dev/null +++ b/test/src/test/java/hudson/maven/Maven3BuildTest.java @@ -0,0 +1,38 @@ +package hudson.maven; + +import hudson.Launcher; +import hudson.model.BuildListener; + +import java.io.IOException; + +import org.jvnet.hudson.test.ExtractResourceSCM; +import org.jvnet.hudson.test.HudsonTestCase; + +/** + * @author Olivier Lamy + */ +public class Maven3BuildTest extends HudsonTestCase { + + /** + * NPE in {@code build.getProject().getWorkspace()} for {@link MavenBuild}. + */ + public void testSimpleMaven3Build() throws Exception { + configureMaven3(); + MavenModuleSet m = createMavenProject(); + m.getReporters().add(new TestReporter()); + m.setScm(new ExtractResourceSCM(getClass().getResource("maven3-project.zip"))); + buildAndAssertSuccess(m); + } + + + + 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; + } + } + +} diff --git a/test/src/test/resources/hudson/maven/maven3-project.zip b/test/src/test/resources/hudson/maven/maven3-project.zip new file mode 100644 index 0000000000..2701bb5b42 Binary files /dev/null and b/test/src/test/resources/hudson/maven/maven3-project.zip differ