From d36a4ab8eb54ffa03f51d5c69f7918ce2a192f13 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 8 May 2009 15:19:51 +0000 Subject: [PATCH] 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 --- .../java/org/apache/maven/model/merge/MavenModelMerger.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git 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 index 19cd70254f..60567915ea 100644 --- 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 context ) + { + // neither inherited nor injected + } + @Override protected void mergeModelBase_Modules( ModelBase target, ModelBase source, boolean sourceDominant, Map context )