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

make sure paths are processed after plugin configuration is merged 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163616 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-18 23:32:37 +00:00
parent 10b55add40
commit 49552c8688
1 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,13 +459,9 @@ public class DefaultPluginManager
public Map createParameters( MojoDescriptor goal, MavenSession session )
throws PluginConfigurationException
{
Map map = null;
List parameters = goal.getParameters();
if ( parameters != null )
{
map = new HashMap();
Map map = new HashMap();
for ( int i = 0; i < parameters.size(); i++ )
{
@ -487,14 +483,6 @@ public class DefaultPluginManager
}
}
String type = parameter.getType();
if ( type != null && ( type.equals( "File" ) || type.equals( "java.io.File" ) ) )
{
value = pathTranslator.alignToBaseDirectory( (String) value,
session.getProject().getFile().getParentFile() );
}
map.put( key, value );
}
@ -502,7 +490,6 @@ public class DefaultPluginManager
{
map = mergeProjectDefinedPluginConfiguration( session.getProject(), goal.getId(), map );
}
}
for ( int i = 0; i < parameters.size(); i++ )
{
@ -525,6 +512,15 @@ public class DefaultPluginManager
{
throw new PluginConfigurationException( createPluginParameterRequiredMessage( goal, parameter ) );
}
String type = parameter.getType();
if ( type != null && ( type.equals( "File" ) || type.equals( "java.io.File" ) ) )
{
value = pathTranslator.alignToBaseDirectory( (String) value,
session.getProject().getFile().getParentFile() );
map.put( key, value );
}
}
return map;