mirror of https://github.com/apache/maven.git
fix properties file basedir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178051 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f5519934fd
commit
6ac1d85984
|
@ -123,7 +123,7 @@ public class Verifier
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Properties loadProperties( File propertiesFile )
|
private Properties loadProperties( String filename )
|
||||||
throws VerificationException
|
throws VerificationException
|
||||||
{
|
{
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
|
@ -131,9 +131,9 @@ public class Verifier
|
||||||
FileInputStream fis = null;
|
FileInputStream fis = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
File propertiesFile = new File( basedir, filename );
|
||||||
if ( propertiesFile.exists() )
|
if ( propertiesFile.exists() )
|
||||||
{
|
{
|
||||||
System.out.println( "Load properties file : " + propertiesFile.getPath() );
|
|
||||||
fis = new FileInputStream( propertiesFile );
|
fis = new FileInputStream( propertiesFile );
|
||||||
properties.load( fis );
|
properties.load( fis );
|
||||||
}
|
}
|
||||||
|
@ -563,7 +563,7 @@ public class Verifier
|
||||||
{
|
{
|
||||||
verifier.executeHook( "prebuild-hook.txt" );
|
verifier.executeHook( "prebuild-hook.txt" );
|
||||||
|
|
||||||
Properties properties = verifier.loadProperties( new File( basedir, "system.properties" ) );
|
Properties properties = verifier.loadProperties( "system.properties" );
|
||||||
|
|
||||||
verifier.executeGoals( properties, "goals.txt" );
|
verifier.executeGoals( properties, "goals.txt" );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue