Author: bentmann
Date: Thu May 21 19:58:13 2009
New Revision: 777237
URL: http://svn.apache.org/viewvc?rev=777237&view=rev
Log:
o Fixed inheritance to exclude project name
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=777237&r1=777236&r2=777237&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Thu May 21 19:58:13 2009
@@ -76,6 +76,19 @@
super.mergeModel( target, source, sourceDominant, context );
}
+
+ @Override
+ protected void mergeModel_Name( Model target, Model source, boolean
sourceDominant, Map<Object, Object> context )
+ {
+ String src = source.getName();
+ if ( src != null )
+ {
+ if ( sourceDominant )
+ {
+ target.setName( src );
+ }
+ }
+ }
@Override
protected void mergeModel_Url( Model target, Model source, boolean
sourceDominant, Map<Object, Object> context )
