svn commit: r764226 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java

[bentmann]

Author: bentmann
Date: Sat Apr 11 18:05:46 2009
New Revision: 764226

URL: http://svn.apache.org/viewvc?rev=764226&view=rev
Log:
o Fixed plugin management injection

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
    
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java?rev=764226&r1=764225&r2=764226&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
 Sat Apr 11 18:05:46 2009
@@ -161,7 +161,6 @@
             for ( Iterator it = plugins.iterator(); it.hasNext(); )
             {
                 Plugin plugin = (Plugin) it.next();
-                BindingUtils.injectPluginManagementInfo( plugin, project );
 
                 PluginDescriptor pluginDescriptor = null;
 

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java?rev=764226&r1=764225&r2=764226&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
 Sat Apr 11 18:05:46 2009
@@ -153,14 +153,14 @@
             target.setId( source.getId() );
         }
         
-        if(target.getInherited() == null)
+        if ( target.getInherited() == null )
         {
-            source.setInherited( target.getInherited() );
+            target.setInherited( source.getInherited() );
         }
-        
-        if(target.getPhase() != null)
+
+        if ( target.getPhase() == null )
         {
-            source.setPhase( target.getPhase() );
+            target.setPhase( source.getPhase() );
         }
         
         List<String> goals = new ArrayList<String>(target.getGoals());