diff --git a/maven-core-it/it2002/project/pom.xml b/maven-core-it/it2002/project/pom.xml index 701e57c59f..ac5d58fdf3 100644 --- a/maven-core-it/it2002/project/pom.xml +++ b/maven-core-it/it2002/project/pom.xml @@ -68,6 +68,23 @@ + + + + org.apache.maven + maven-artifact + 2.0-beta-1 + test + + + org.apache.maven + maven-artifact-manager + 2.0-beta-1 + test + + + + env-test @@ -82,14 +99,6 @@ org.apache.maven maven-artifact - 2.0-beta-1 - test - - - org.apache.maven - maven-artifact-manager - 2.0-beta-1 - test diff --git a/maven-core-it/it2002/project/subproject/pom.xml b/maven-core-it/it2002/project/subproject/pom.xml index ba3299371e..db2f9176eb 100644 --- a/maven-core-it/it2002/project/subproject/pom.xml +++ b/maven-core-it/it2002/project/subproject/pom.xml @@ -8,4 +8,10 @@ project-sub1 + + + org.apache.maven + maven-artifact-manager + + diff --git a/maven-core-it/it2002/project/subproject2/pom.xml b/maven-core-it/it2002/project/subproject2/pom.xml index 3bc3150278..85348a6588 100644 --- a/maven-core-it/it2002/project/subproject2/pom.xml +++ b/maven-core-it/it2002/project/subproject2/pom.xml @@ -14,6 +14,10 @@ project-sub1 1.0-SNAPSHOT + + org.apache.maven + maven-artifact-manager + diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 27894e7b2e..1e845c8654 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -337,9 +337,12 @@ public class DefaultMaven { File file = (File) iterator.next(); + boolean usingReleasePom = false; + if ( RELEASE_POMv4.equals( file.getName() ) ) { getLogger().info( "NOTE: Using release-pom: " + file + " in reactor build." ); + usingReleasePom = true; } MavenProject project = getProject( file, localRepository, settings, globalProfileManager ); @@ -366,7 +369,19 @@ public class DefaultMaven for ( Iterator i = project.getModules().iterator(); i.hasNext(); ) { String name = (String) i.next(); - moduleFiles.add( new File( basedir, name + "/pom.xml" ) ); + + File moduleFile; + + if ( usingReleasePom ) + { + moduleFile = new File( basedir, name + "/" + Maven.RELEASE_POMv4 ); + } + else + { + moduleFile = new File( basedir, name + "/" + Maven.POMv4 ); + } + + moduleFiles.add( moduleFile ); } List collectedProjects = collectProjects( moduleFiles, localRepository, recursive, settings,