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

After r231121 the <modules/> in poms were ignored. I tracked the changes, 

and it was obvious: merge code didn't merge the Modules section, and possibly
other sections aswell. Also putting all normal model build info in a profile and
then copying profile data back to the model seemed odd to me. Now only
data from profiles that actually get merged is merged.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@231470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2005-08-11 14:35:20 +00:00
parent a133047280
commit c897fa04c1
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
View File

@ -12,15 +12,7 @@ public class DefaultProfileInjector
public void inject( Profile profile, Model model )
{
ModelUtils.mergeModelBases( profile, model );
model.setDependencies( profile.getDependencies() );
model.setDependencyManagement( profile.getDependencyManagement() );
model.setDistributionManagement( profile.getDistributionManagement() );
model.setModules( profile.getModules() );
model.setPluginRepositories( profile.getPluginRepositories() );
model.setReporting( profile.getReporting() );
model.setRepositories( profile.getRepositories() );
ModelUtils.mergeModelBases( model, profile );
BuildBase profileBuild = profile.getBuild();
if ( profileBuild != null )