[JENKINS-15935] Can't build using maven 3.1.0 latest release candidate

Merge branch 'maven-3.1.0' for maven 3.1.0 support in Maven Integration Plugin
This commit is contained in:
Olivier Lamy committed 2013-07-24 10:16:20 +10:00
commit 941e83fae1
26 files changed
+713 -225

No files matched your search

@@ -545,7 +545,15 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
MavenInstallation m3 = new MavenInstallation("apache-maven-3.0.1",mvn.getHome(), NO_PROPERTIES);
jenkins.getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(m3);
return m3;
}
}
protected MavenInstallation configureMaven31() throws Exception {
MavenInstallation mvn = configureDefaultMaven("apache-maven-3.1.0", MavenInstallation.MAVEN_30);
MavenInstallation m3 = new MavenInstallation("apache-maven-3.1.0",mvn.getHome(), NO_PROPERTIES);
jenkins.getDescriptorByType(Maven.DescriptorImpl.class).setInstallations(m3);
return m3;
}
/**
* Locates Maven2 and configure that as the only Maven in the system.
@@ -720,7 +720,9 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
* @see #configureDefaultMaven()
*/
public MavenModuleSet createMavenProject(String name) throws IOException {
return jenkins.createProject(MavenModuleSet.class,name);
MavenModuleSet mavenModuleSet = jenkins.createProject(MavenModuleSet.class,name);
mavenModuleSet.setRunHeadless( true );
return mavenModuleSet;
}
/**