svn commit: r293213 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

[brett]

Author: brett
Date: Sun Oct  2 19:34:41 2005
New Revision: 293213

URL: http://svn.apache.org/viewcvs?rev=293213&view=rev
Log:
PR: MNG-895
revert to previous inheritence behaviour - only do it for profiles

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=293213&r1=293212&r2=293213&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Sun Oct  2 19:34:41 2005
@@ -367,8 +367,18 @@
             }
 
             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
             ModelUtils.mergePluginLists( childBuild, parentBuild, true );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]