Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-07 02:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix plugin configuration discovery

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163536 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-12 06:10:57 +00:00
parent c6978405cf
commit d179db8752
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,14 +182,16 @@ public boolean isPluginInstalled( String groupId, String artifactId )
return pluginDescriptors.containsKey( constructPluginKey( groupId, artifactId ) );
}
private String getPluginId( String goalName )
private static String getPluginId( String goalName )
{
if ( goalName.indexOf( ":" ) > 0 )
String pluginId = goalName;
if ( pluginId.indexOf( ":" ) > 0 )
{
return goalName.substring( 0, goalName.indexOf( ":" ) );
pluginId = pluginId.substring( 0, pluginId.indexOf( ":" ) );
}
return goalName;
return "maven-" + pluginId + "-plugin";
}
// TODO: don't throw Exception
@ -198,7 +200,7 @@ public void verifyPluginForGoal( String goalName, MavenSession session ) throws
String pluginId = getPluginId( goalName );
// TODO: hardcoding of group ID/artifact ID
verifyPlugin( "maven", "maven-" + pluginId + "-plugin", session );
verifyPlugin( "maven", pluginId, session );
}
// TODO: don't throw Exception
@ -515,7 +517,7 @@ public static Map mergeProjectDefinedPluginConfiguration( MavenProject project,
if ( project.getPlugins() != null )
{
String pluginId = goalId.substring( 0, goalId.indexOf( ":" ) );
String pluginId = getPluginId( goalId );
for ( Iterator iterator = project.getPlugins().iterator(); iterator.hasNext(); )
{