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

PR: MNG-895 

revert to previous inheritence behaviour - only do it for profiles

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-03 02:34:41 +00:00
parent f87dfbf04a
commit 598cd29727
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -367,8 +367,18 @@ public class DefaultModelInheritanceAssembler
} }
ModelUtils.mergeFilterLists( childBuild.getFilters(), parentBuild.getFilters() ); ModelUtils.mergeFilterLists( childBuild.getFilters(), parentBuild.getFilters() );
ModelUtils.mergeResourceLists( childBuild.getResources(), parentBuild.getResources() );
ModelUtils.mergeResourceLists( childBuild.getTestResources(), parentBuild.getTestResources() ); List resources = childBuild.getResources();
if ( resources == null || resources.isEmpty() )
{
childBuild.setResources( parentBuild.getResources() );
}
resources = childBuild.getTestResources();
if ( resources == null || resources.isEmpty() )
{
childBuild.setTestResources( parentBuild.getTestResources() );
}
// Plugins are aggregated if Plugin.inherit != false // Plugins are aggregated if Plugin.inherit != false
ModelUtils.mergePluginLists( childBuild, parentBuild, true ); ModelUtils.mergePluginLists( childBuild, parentBuild, true );