diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java index 7a373951f5..38acdf955e 100644 --- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java +++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java @@ -1966,7 +1966,10 @@ public class ModelMerger mergeNotifier_Type( target, source, sourceDominant, context ); mergeNotifier_Address( target, source, sourceDominant, context ); mergeNotifier_Configuration( target, source, sourceDominant, context ); - // TODO + mergeNotifier_SendOnError( target, source, sourceDominant, context ); + mergeNotifier_SendOnFailure( target, source, sourceDominant, context ); + mergeNotifier_SendOnSuccess( target, source, sourceDominant, context ); + mergeNotifier_SendOnWarning( target, source, sourceDominant, context ); } protected void mergeNotifier_Type( Notifier target, Notifier source, boolean sourceDominant, @@ -2012,6 +2015,42 @@ public class ModelMerger target.setConfiguration( merged ); } + protected void mergeNotifier_SendOnError( Notifier target, Notifier source, boolean sourceDominant, + Map context ) + { + if ( sourceDominant ) + { + target.setSendOnError( source.isSendOnError() ); + } + } + + protected void mergeNotifier_SendOnFailure( Notifier target, Notifier source, boolean sourceDominant, + Map context ) + { + if ( sourceDominant ) + { + target.setSendOnFailure( source.isSendOnFailure() ); + } + } + + protected void mergeNotifier_SendOnSuccess( Notifier target, Notifier source, boolean sourceDominant, + Map context ) + { + if ( sourceDominant ) + { + target.setSendOnSuccess( source.isSendOnSuccess() ); + } + } + + protected void mergeNotifier_SendOnWarning( Notifier target, Notifier source, boolean sourceDominant, + Map context ) + { + if ( sourceDominant ) + { + target.setSendOnWarning( source.isSendOnWarning() ); + } + } + protected void mergePrerequisites( Prerequisites target, Prerequisites source, boolean sourceDominant, Map context ) {