You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2009/05/06 21:09:23 UTC
svn commit: r772405 -
/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: pgier
Date: Wed May 6 19:09:23 2009
New Revision: 772405
URL: http://svn.apache.org/viewvc?rev=772405&view=rev
Log:
[MANTTASKS-144] settings file should be ignored if it doesn't exist.
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=772405&r1=772404&r2=772405&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Wed May 6 19:09:23 2009
@@ -230,26 +230,26 @@
{
if ( userSettingsFile == null )
{
- File settingsFile = newFile( System.getProperty( "user.home" ), ".ant", "settings.xml" );
- if ( settingsFile.exists() )
+ File tempSettingsFile = newFile( System.getProperty( "user.home" ), ".ant", "settings.xml" );
+ if ( tempSettingsFile.exists() )
{
- userSettingsFile = settingsFile;
+ userSettingsFile = tempSettingsFile;
}
else
{
- settingsFile = newFile( System.getProperty( "user.home" ), ".m2", "settings.xml" );
- if ( settingsFile.exists() )
+ tempSettingsFile = newFile( System.getProperty( "user.home" ), ".m2", "settings.xml" );
+ if ( tempSettingsFile.exists() )
{
- userSettingsFile = settingsFile;
+ userSettingsFile = tempSettingsFile;
}
}
}
if ( globalSettingsFile == null )
{
- File settingsFile = newFile( System.getProperty( "ant.home" ), "etc", "settings.xml" );
- if ( settingsFile.exists() )
+ File tempSettingsFile = newFile( System.getProperty( "ant.home" ), "etc", "settings.xml" );
+ if ( tempSettingsFile.exists() )
{
- globalSettingsFile = settingsFile;
+ globalSettingsFile = tempSettingsFile;
}
else
{
@@ -261,7 +261,11 @@
if ( var.startsWith( "M2_HOME=" ) )
{
String m2Home = var.substring( "M2_HOME=".length() );
- globalSettingsFile = newFile( m2Home, "conf", "settings.xml" );
+ tempSettingsFile = newFile( m2Home, "conf", "settings.xml" );
+ if ( tempSettingsFile.exists() )
+ {
+ globalSettingsFile = tempSettingsFile;
+ }
break;
}
}