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

PR: MNG-644 

put back code that was hiding in a method with a name unrelated to it

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293357 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-03 14:16:16 +00:00
parent 01aee704da
commit 9f52ee0fcf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
View File

@ -198,6 +198,13 @@ public final class ModelUtils
child.setVersion( parent.getVersion() ); child.setVersion( parent.getVersion() );
} }
Xpp3Dom childConfiguration = (Xpp3Dom) child.getConfiguration();
Xpp3Dom parentConfiguration = (Xpp3Dom) parent.getConfiguration();
childConfiguration = Xpp3Dom.mergeXpp3Dom( childConfiguration, parentConfiguration );
child.setConfiguration( childConfiguration );
// from here to the end of the method is dealing with merging of the <executions/> section. // from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited(); String parentInherited = parent.getInherited();
@ -503,13 +510,11 @@ public final class ModelUtils
newR.setOutputDirectory( reporting.getOutputDirectory() ); newR.setOutputDirectory( reporting.getOutputDirectory() );
List newP = null;
List plugins = reporting.getPlugins(); List plugins = reporting.getPlugins();
if ( plugins != null ) if ( plugins != null )
{ {
newP = new ArrayList( plugins.size() ); List newP = new ArrayList( plugins.size() );
for ( Iterator it = plugins.iterator(); it.hasNext(); ) for ( Iterator it = plugins.iterator(); it.hasNext(); )
{ {