maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r793910 - in /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/inheritance: DefaultModelInheritanceAssembler.java ModelInheritanceAssembler.java
Date Tue, 14 Jul 2009 14:38:57 GMT
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 );



Mime
View raw message