dion 2002/06/23 02:42:22
Modified: src/java/org/apache/maven Build.java
Log:
Made ${user.home}/build.properties optional as Vincent doesn't use it
Revision Changes Path
1.19 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/Build.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Build.java 23 Jun 2002 03:16:16 -0000 1.18
+++ Build.java 23 Jun 2002 09:42:22 -0000 1.19
@@ -255,7 +255,7 @@
{
String userDefaults = System.getProperty("user.home") +
"/build.properties";
- resolver.addPropertiesFromFile(userDefaults);
+ resolver.addPropertiesFromOptionalFile(userDefaults);
resolver.addProperties(System.getProperties());
// load properties least significant first, so that overrides work
String mavenDefaults = getProperty("maven.home") +
@@ -267,7 +267,7 @@
resolver.addPropertiesFromOptionalFile(buildDefaults);
// reload defaults in correct place
userDefaults = getProperty("user.home") + "/build.properties";
- resolver.addPropertiesFromFile(userDefaults);
+ resolver.addPropertiesFromOptionalFile(userDefaults);
resolver.addProperties(System.getProperties());
// add maven project
setProperty("maven", getProjectDescriptor().getProject());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
