You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/14 16:38:57 UTC
svn commit: r793910 - in
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance:
DefaultModelInheritanceAssembler.java ModelInheritanceAssembler.java
Author: bentmann
Date: Tue Jul 14 14:38:57 2009
New Revision: 793910
URL: http://svn.apache.org/viewvc?rev=793910&view=rev
Log:
[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
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=793910&r1=793909&r2=793910&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Tue Jul 14 14:38:57 2009
@@ -176,6 +176,16 @@
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.
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java?rev=793910&r1=793909&r2=793910&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java Tue Jul 14 14:38:57 2009
@@ -32,6 +32,10 @@
{
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 );