From 433d4bf3b87da1dc381a873fb7d095a46cecb314 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 14 Jul 2009 14:38:57 +0000 Subject: [PATCH] [MNG-4239] NoSuchMethodError org.apache.maven.project.inheritance.ModelInheritanceAssembler.assembleModelInheritance(Lorg/apache/maven/model/Model;Lorg/apache/maven/model/Model;)V o Restored legacy API git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793910 13f79535-47bb-0310-9956-ffa450edef68 --- .../inheritance/DefaultModelInheritanceAssembler.java | 10 ++++++++++ .../project/inheritance/ModelInheritanceAssembler.java | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index 3c1256d6d7..59ba296422 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -176,6 +176,16 @@ public class DefaultModelInheritanceAssembler assembleModelInheritance( dest, source, null, false ); } + public void assembleModelInheritance( Model child, Model parent, String childPathAdjustment ) + { + assembleModelInheritance( child, parent, childPathAdjustment, true ); + } + + public void assembleModelInheritance( Model child, Model parent ) + { + assembleModelInheritance( child, parent, null, true ); + } + private void assembleModelInheritance( Model child, Model parent, String childPathAdjustment, boolean appendPaths ) { // cannot inherit from null parent. diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java index f7fcb50ab4..1e47b326e1 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java @@ -32,6 +32,10 @@ public interface ModelInheritanceAssembler { String ROLE = ModelInheritanceAssembler.class.getName(); + void assembleModelInheritance( Model child, Model parent, String childPathAdjustment ); + + void assembleModelInheritance( Model child, Model parent ); + void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheriance ); void copyModel( Model dest, Model source );