You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/02/10 03:01:00 UTC
svn commit: r505611 -
/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Author: jvanzyl
Date: Fri Feb 9 18:01:00 2007
New Revision: 505611
URL: http://svn.apache.org/viewvc?view=rev&rev=505611
Log:
o fixing finding of settings file
Submitted by: Eugene Kuleshove
Modified:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?view=diff&rev=505611&r1=505610&r2=505611
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Fri Feb 9 18:01:00 2007
@@ -51,6 +51,11 @@
{
Settings globalSettings = readSettings( globalSettingsFile );
+ if ( userSettingsFile == null )
+ {
+ userSettingsFile = new File( new File( System.getProperty( "user.home" ) ), ".m2/settings.xml" );
+ }
+
Settings userSettings = readSettings( userSettingsFile );
if ( globalSettings == null )