Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolving: MNG-929 

o Fixed DefaultMaven to use the release-pom.xml for MavenProjects loaded via <modules/> if the parent project is loaded from release-pom.xml

o Adjusted tests to have dependencyManagement.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290539 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-09-20 19:28:54 +00:00
parent a6a01793d8
commit 83d67e6f81
4 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maven-core-it/it2002/project/pom.xml
View File

@ -68,6 +68,23 @@
</plugins> </plugins>
</reporting> </reporting>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles> <profiles>
<profile> <profile>
<id>env-test</id> <id>env-test</id>
@ -82,14 +99,6 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

6
maven-core-it/it2002/project/subproject/pom.xml
View File

@ -8,4 +8,10 @@
<artifactId>project-sub1</artifactId> <artifactId>project-sub1</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
</dependency>
</dependencies>
</project> </project>

4
maven-core-it/it2002/project/subproject2/pom.xml
View File

@ -14,6 +14,10 @@
<artifactId>project-sub1</artifactId> <artifactId>project-sub1</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

17
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -337,9 +337,12 @@ public class DefaultMaven
{ {
File file = (File) iterator.next(); File file = (File) iterator.next();
boolean usingReleasePom = false;
if ( RELEASE_POMv4.equals( file.getName() ) ) if ( RELEASE_POMv4.equals( file.getName() ) )
{ {
getLogger().info( "NOTE: Using release-pom: " + file + " in reactor build." ); getLogger().info( "NOTE: Using release-pom: " + file + " in reactor build." );
usingReleasePom = true;
} }
MavenProject project = getProject( file, localRepository, settings, globalProfileManager ); MavenProject project = getProject( file, localRepository, settings, globalProfileManager );
@ -366,7 +369,19 @@ public class DefaultMaven
for ( Iterator i = project.getModules().iterator(); i.hasNext(); ) for ( Iterator i = project.getModules().iterator(); i.hasNext(); )
{ {
String name = (String) i.next(); 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, List collectedProjects = collectProjects( moduleFiles, localRepository, recursive, settings,