/[Apache-SVN]
ViewVC logotype

Revision 231481


Jump to revision: Previous Next
Author: jdcasey
Date: Thu Aug 11 16:46:19 2005 UTC (19 years, 3 months ago)
Changed paths: 7
Log Message:
o Removed it0048, and replaced it with a unit test for the DefaultProfileInjector.
o Reverted the logic of the DefaultProfileInjector to merge-and-override the model, with the profile being dominant
o Added merging for distributionManagement and modules (conditionally, based on flag) in the modelBase merge
o Refactored the override logic into a couple of methods in ModelUtils to make it easier to understand what's going on here.
o Verified that both the build and the model itself are being merged correctly during profile injection, with profile dominance, but persistence of changes to the model.


Changed paths

Path Details
Directorymaven/components/trunk/maven-core-it/README.txt modified , text changed
Directorymaven/components/trunk/maven-core-it/integration-tests.txt modified , text changed
Directorymaven/components/trunk/maven-core-it/it0048/ deleted
Directorymaven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java modified , text changed
Directorymaven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java modified , text changed
Directorymaven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java modified , text changed
Directorymaven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java added

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26