Author: bentmann
Date: Fri May 8 15:19:51 2009
New Revision: 773031
URL: http://svn.apache.org/viewvc?rev=773031&view=rev
Log:
o Continued work on model merging
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=773031&r1=773030&r2=773031&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
Fri May 8 15:19:51 2009
@@ -148,6 +148,12 @@
}
@Override
+ protected void mergeModel_Profiles( Model target, Model source, boolean
sourceDominant, Map<Object, Object> context )
+ {
+ // neither inherited nor injected
+ }
+
+ @Override
protected void mergeModelBase_Modules( ModelBase target, ModelBase source,
boolean sourceDominant,
Map<Object, Object> context )
{
