From c897fa04c175aa5e276d3949c868961398c8f7fa Mon Sep 17 00:00:00 2001 From: Kenney Westerhof Date: Thu, 11 Aug 2005 14:35:20 +0000 Subject: [PATCH] After r231121 the 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 --- .../project/injection/DefaultProfileInjector.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java index 1858033ee5..58f45d7898 100644 --- a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java +++ b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java @@ -12,16 +12,8 @@ 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 ) {