You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/04 04:38:39 UTC
svn commit: r168052 - in /maven/components/trunk/maven-core/src/main:
java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
resources/META-INF/plexus/components.xml
Author: brett
Date: Tue May 3 19:38:39 2005
New Revision: 168052
URL: http://svn.apache.org/viewcvs?rev=168052&view=rev
Log:
reduce the code duplication of the injection
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
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=168052&r1=168051&r2=168052&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 Tue May 3 19:38:39 2005
@@ -35,6 +35,7 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -69,6 +70,8 @@
private PluginManager pluginManager;
+ private ModelDefaultsInjector modelDefaultsInjector;
+
private List phases;
// ----------------------------------------------------------------------
@@ -196,31 +199,15 @@
project.addPlugin( plugin );
}
+ // TODO: shouldn't have to call all the time
+ modelDefaultsInjector.injectDefaults( project.getModel() );
+
+ // TODO: remove - should discover the version
+ plugin = findPlugin( project.getPlugins(), groupId, artifactId );
if ( plugin.getVersion() == null )
{
- while ( project != null )
- {
- PluginManagement pluginManagement = project.getPluginManagement();
-
- if ( pluginManagement != null )
- {
- Plugin management = findPlugin( pluginManagement.getPlugins(), groupId, artifactId );
- if ( management != null && management.getVersion() != null )
- {
- plugin.setVersion( management.getVersion() );
- break;
- }
- }
- project = project.getParent();
- }
-
- if ( plugin.getVersion() == null )
- {
- // TODO: this has probably supplanted the default in the plugin manager
- plugin.setVersion( PluginDescriptor.getDefaultPluginVersion() );
- }
+ plugin.setVersion( PluginDescriptor.getDefaultPluginVersion() );
}
-
}
private static Plugin findPlugin( List plugins, String groupId, String artifactId )
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=168052&r1=168051&r2=168052&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 Tue May 3 19:38:39 2005
@@ -54,6 +54,9 @@
<requirement>
<role>org.apache.maven.plugin.PluginManager</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
+ </requirement>
</requirements>
<configuration>
<!-- START SNIPPET: lifecyle -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org