Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix project reference 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306649 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-06 14:06:52 +00:00
parent e11e54f74a
commit df94412864
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -269,7 +269,7 @@ public class DefaultPluginManager
if ( ref.getArtifact().getDependencyConflictId().equals( pluginArtifact.getDependencyConflictId() ) ) if ( ref.getArtifact().getDependencyConflictId().equals( pluginArtifact.getDependencyConflictId() ) )
{ {
// if the project artifact doesn't exist, don't use it. We haven't built that far. // if the project artifact doesn't exist, don't use it. We haven't built that far.
if ( project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() ) if ( ref.getArtifact().getFile() != null && ref.getArtifact().getFile().exists() )
{ {
pluginArtifact = new ActiveProjectArtifact( ref, pluginArtifact ); pluginArtifact = new ActiveProjectArtifact( ref, pluginArtifact );
} }
@ -584,7 +584,7 @@ public class DefaultPluginManager
PlexusConfiguration extractedMojoConfiguration = extractMojoConfiguration( mergedConfiguration, PlexusConfiguration extractedMojoConfiguration = extractMojoConfiguration( mergedConfiguration,
mojoDescriptor ); mojoDescriptor );
checkRequiredParameters( mojoDescriptor, extractedMojoConfiguration, expressionEvaluator, plugin ); checkRequiredParameters( mojoDescriptor, extractedMojoConfiguration, expressionEvaluator );
populatePluginFields( plugin, mojoDescriptor, extractedMojoConfiguration, pluginContainer, populatePluginFields( plugin, mojoDescriptor, extractedMojoConfiguration, pluginContainer,
expressionEvaluator ); expressionEvaluator );
@ -746,7 +746,7 @@ public class DefaultPluginManager
} }
private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration, private void checkRequiredParameters( MojoDescriptor goal, PlexusConfiguration configuration,
ExpressionEvaluator expressionEvaluator, Mojo plugin ) ExpressionEvaluator expressionEvaluator )
throws PluginConfigurationException throws PluginConfigurationException
{ {
// TODO: this should be built in to the configurator, as we presently double process the expressions // TODO: this should be built in to the configurator, as we presently double process the expressions
@ -1084,29 +1084,6 @@ public class DefaultPluginManager
} }
} }
private Field findPluginField( Class clazz, String key )
throws NoSuchFieldException
{
Field field = null;
while ( field == null )
{
try
{
field = clazz.getDeclaredField( key );
}
catch ( NoSuchFieldException e )
{
clazz = clazz.getSuperclass();
if ( clazz.equals( Object.class ) )
{
throw e;
}
}
}
return field;
}
public static String createPluginParameterRequiredMessage( MojoDescriptor mojo, Parameter parameter, public static String createPluginParameterRequiredMessage( MojoDescriptor mojo, Parameter parameter,
String expression ) String expression )
{ {