brett 2005/03/22 03:42:23
Modified: maven-core/src/main/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssembler.java
Log:
don't aggregate plugins
Revision Changes Path
1.26 +1 -17
maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultModelInheritanceAssembler.java 22 Mar 2005 11:29:55 -0000
1.25
+++ DefaultModelInheritanceAssembler.java 22 Mar 2005 11:42:23 -0000
1.26
@@ -151,23 +151,7 @@
}
}
- // Plugins :: aggregate
- if ( parent.getBuild() != null && child.getBuild() != null )
- {
- List parentPlugins = parent.getBuild().getPlugins();
-
- List childPlugins = child.getBuild().getPlugins();
-
- for ( Iterator iterator = parentPlugins.iterator();
iterator.hasNext(); )
- {
- Plugin plugin = (Plugin) iterator.next();
-
- if ( !childPlugins.contains( plugin ) )
- {
- child.getBuild().addPlugin( plugin );
- }
- }
- }
+ // Plugins are not aggregated
// Reports :: aggregate
if ( child.getReports() != null && parent.getReports() != null )