maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r674893 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: ModelUtils.java inheritance/DefaultModelInheritanceAssembler.java inheritance/ModelInheritanceAssembler.java
Date Tue, 08 Jul 2008 17:37:45 GMT
Author: jdcasey
Date: Tue Jul  8 10:37:45 2008
New Revision: 674893

URL: http://svn.apache.org/viewvc?rev=674893&view=rev
Log:
[MNG-3654] Make sure all plugins are carried over into cloned build instances.

Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=674893&r1=674892&r2=674893&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Tue Jul  8 10:37:45 2008
@@ -587,7 +587,7 @@
 
         Build clone = new Build();
 
-        assembler.assembleBuildInheritance( clone, build );
+        assembler.assembleBuildInheritance( clone, build, false );
 
         return clone;
     }

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=674893&r1=674892&r2=674893&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Tue Jul  8 10:37:45 2008
@@ -291,14 +291,15 @@
                 child.setBuild( childBuild );
             }
 
-            assembleBuildInheritance( childBuild, parentBuild );
+            assembleBuildInheritance( childBuild, parentBuild, true );
         }
     }
 
     // TODO: Remove this!
     @SuppressWarnings("unchecked")
     public void assembleBuildInheritance( Build childBuild,
-                                           Build parentBuild )
+                                           Build parentBuild,
+                                           boolean handleAsInheritance )
     {
         // The build has been set but we want to step in here and fill in
         // values that have not been set by the child.
@@ -361,7 +362,7 @@
         }
 
         // Plugins are aggregated if Plugin.inherit != false
-        ModelUtils.mergePluginLists( childBuild, parentBuild, true );
+        ModelUtils.mergePluginLists( childBuild, parentBuild, handleAsInheritance );
 
         // Plugin management :: aggregate
         PluginManagement dominantPM = childBuild.getPluginManagement();

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java?rev=674893&r1=674892&r2=674893&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
Tue Jul  8 10:37:45 2008
@@ -35,7 +35,8 @@
     void assembleModelInheritance( Model child, Model parent );
 
     void assembleBuildInheritance( Build childBuild,
-                                          Build parentBuild );
+                                          Build parentBuild,
+                                          boolean handleAsInheriance );
 
     void copyModel( Model dest, Model source );
 }



Mime
View raw message