[MNG-3731] Detect absolute script directories, and only prepend basedir to relative paths.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@689698 13f79535-47bb-0310-9956-ffa450edef68master
parent
969c5cb752
commit
7e65cf62ad
|
|
@ -48,6 +48,7 @@ public abstract class AbstractScriptedMojoDescriptorExtractor
|
||||||
public List execute( MavenProject project, PluginDescriptor pluginDescriptor )
|
public List execute( MavenProject project, PluginDescriptor pluginDescriptor )
|
||||||
throws ExtractionException, InvalidPluginDescriptorException
|
throws ExtractionException, InvalidPluginDescriptorException
|
||||||
{
|
{
|
||||||
|
getLogger().info( "Running: " + getClass().getName() );
|
||||||
String metadataExtension = getMetadataFileExtension();
|
String metadataExtension = getMetadataFileExtension();
|
||||||
String scriptExtension = getScriptFileExtension();
|
String scriptExtension = getScriptFileExtension();
|
||||||
|
|
||||||
|
|
@ -142,7 +143,12 @@ public abstract class AbstractScriptedMojoDescriptorExtractor
|
||||||
|
|
||||||
String resourceDir = (String) it.next();
|
String resourceDir = (String) it.next();
|
||||||
|
|
||||||
File dir = new File( basedir, resourceDir ).getAbsoluteFile();
|
getLogger().info( "Scanning script dir: " + resourceDir + " with extractor: " + getClass().getName() );
|
||||||
|
File dir = new File( resourceDir );
|
||||||
|
if ( !dir.isAbsolute() )
|
||||||
|
{
|
||||||
|
dir = new File( basedir, resourceDir ).getAbsoluteFile();
|
||||||
|
}
|
||||||
|
|
||||||
resourceDir = dir.getPath();
|
resourceDir = dir.getPath();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue