Author: jdcasey
Date: Mon Oct 3 14:38:35 2005
New Revision: 293454
URL: http://svn.apache.org/viewcvs?rev=293454&view=rev
Log:
Resolving: MNG-1052
o Added pluginManagement injection to MavenProject.addPlugin(..) so that no
Plugin definition added to the project can go without having managed info
injected into it.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=293454&r1=293453&r2=293454&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon Oct 3 14:38:35 2005
@@ -29,7 +29,6 @@
import org.apache.maven.model.Extension;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.monitor.event.EventDispatcher;
@@ -47,7 +46,6 @@
import org.apache.maven.plugin.lifecycle.Phase;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.reactor.ReactorException;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.settings.Settings;
@@ -82,8 +80,6 @@
// Components
// ----------------------------------------------------------------------
- private ModelDefaultsInjector modelDefaultsInjector;
-
private PluginManager pluginManager;
private ExtensionManager extensionManager;
@@ -1291,7 +1287,9 @@
}
}
- injectHandlerPluginConfiguration( project, plugin );
+ // this has been simplified from the old code that injected the plugin
management stuff, since
+ // pluginManagement injection is now handled by the project method.
+ project.addPlugin( plugin );
MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal );
if ( mojoDescriptor == null )
@@ -1300,29 +1298,6 @@
}
return mojoDescriptor;
- }
-
- private void injectHandlerPluginConfiguration( MavenProject project,
Plugin plugin )
- {
- String key = plugin.getKey();
-
- Plugin buildPlugin = (Plugin)
project.getBuild().getPluginsAsMap().get( key );
-
- if ( buildPlugin == null )
- {
- PluginManagement pluginManagement = project.getPluginManagement();
- if ( pluginManagement != null )
- {
- Plugin managedPlugin = (Plugin)
pluginManagement.getPluginsAsMap().get( key );
-
- if ( managedPlugin != null )
- {
- modelDefaultsInjector.mergePluginWithDefaults( plugin,
managedPlugin );
- }
- }
-
- project.addPlugin( plugin );
- }
}
protected void line()
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=293454&r1=293453&r2=293454&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Mon Oct 3 14:38:35 2005
@@ -153,9 +153,6 @@
<role>org.apache.maven.extension.ExtensionManager</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
</requirements>
Modified: maven/components/trunk/maven-model/maven.mdo
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=293454&r1=293453&r2=293454&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Mon Oct 3 14:38:35 2005
@@ -2470,6 +2470,14 @@
</association>
</field>
</fields>
+ <codeSegments>
+ <codeSegment>
+ <version>4.0.0</version>
+ <code><![CDATA[
+ public static final String DEFAULT_EXECUTION_ID = "default";
+ ]]></code>
+ </codeSegment>
+ </codeSegments>
</class>
<class>
<name>DependencyManagement</name>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=293454&r1=293453&r2=293454&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Mon Oct 3 14:38:35 2005
@@ -1132,6 +1132,23 @@
if ( !build.getPluginsAsMap().containsKey( plugin.getKey() ) )
{
+ PluginManagement pm = build.getPluginManagement();
+
+ if ( pm != null )
+ {
+ Map pmByKey = pm.getPluginsAsMap();
+
+ String pluginKey = plugin.getKey();
+
+ if ( pmByKey != null && pmByKey.containsKey( pluginKey ) )
+ {
+ Plugin pmPlugin = (Plugin) pmByKey.get( pluginKey );
+
+ ModelUtils.mergePluginDefinitions( plugin, pmPlugin, false
);
+ }
+
+ }
+
build.addPlugin( plugin );
build.flushPluginMap();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
