/[Apache-SVN]
ViewVC logotype

Revision 641662


Jump to revision: Previous Next
Author: jdcasey
Date: Thu Mar 27 00:47:51 2008 UTC (16 years, 7 months ago)
Changed paths: 5
Log Message:
[MNG-3482][MNG-3391]

1. Moving the mergeManagedDependencies(..) call INSIDE of processProjectLogic(..), to just AFTER interpolation but BEFORE injection of managed-dependency information into the main dependencies information, and also ahead of model validation. This allows expressions in imported-POM specifications to be interpolated before these are merged to the current project.

2. Restricting the mergeManagedDependencies(..) logic to only happen when type == pom (which was already there) AND scope == import (which is new). 

ALSO related to [MNG-3483].

Changed paths

Path Details
Directorymaven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java modified , text changed
Directorymaven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java modified , text changed
Directorymaven/components/trunk/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java modified , text changed
Directorymaven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml modified , text changed
Directorymaven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26