Author: jdcasey
Date: Tue Sep 20 12:28:54 2005
New Revision: 290539
URL: http://svn.apache.org/viewcvs?rev=290539&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-core-it/it2002/project/pom.xml
maven/components/trunk/maven-core-it/it2002/project/subproject/pom.xml
maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified: maven/components/trunk/maven-core-it/it2002/project/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/pom.xml?rev=290539&r1=290538&r2=290539&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it2002/project/pom.xml Tue Sep 20
12:28:54 2005
@@ -68,6 +68,23 @@
</plugins>
</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>
<profile>
<id>env-test</id>
@@ -82,14 +99,6 @@
<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>
</profile>
Modified: maven/components/trunk/maven-core-it/it2002/project/subproject/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/subproject/pom.xml?rev=290539&r1=290538&r2=290539&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/subproject/pom.xml
(original)
+++ maven/components/trunk/maven-core-it/it2002/project/subproject/pom.xml Tue
Sep 20 12:28:54 2005
@@ -8,4 +8,10 @@
<artifactId>project-sub1</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified:
maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml?rev=290539&r1=290538&r2=290539&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
(original)
+++ maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml Tue
Sep 20 12:28:54 2005
@@ -14,6 +14,10 @@
<artifactId>project-sub1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=290539&r1=290538&r2=290539&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Sep 20 12:28:54 2005
@@ -337,9 +337,12 @@
{
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 @@
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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
