o Continued work on model merging

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773031 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:19:51 +00:00 · 2009-05-08 15:19:51 +00:00 · d36a4ab8eb
parent 8c9c235744
commit d36a4ab8eb
1 changed files with 6 additions and 0 deletions
--- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
@ -147,6 +147,12 @@ public class MavenModelMerger
        }
    }

+    @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 )