Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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

Originally-Committed-As: 941e83fae1f12cb442d2b4b3c434e0c2e7e9611e
  • Loading branch information
olamy committed Jul 24, 2013
2 parents 81101cb + a538f5e commit 00a4ee5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
10 changes: 9 additions & 1 deletion test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
Expand Up @@ -545,7 +545,15 @@ protected MavenInstallation configureMaven3() throws Exception {
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.
Expand Down
4 changes: 3 additions & 1 deletion test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
Expand Up @@ -720,7 +720,9 @@ public MavenModuleSet createMavenProject() throws IOException {
* @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;
}

/**
Expand Down
Binary file not shown.

0 comments on commit 00a4ee5

Please sign in to comment.