Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o remove dead method, the embedder now takes care of all defaulting so we don't need this method anymore. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573478 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-09-07 06:42:31 +00:00
parent 357015041a
commit 28ac7d65cb
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View File

@ -21,7 +21,6 @@ package org.apache.maven.settings;
import org.apache.maven.context.BuildContextManager;
import org.apache.maven.context.SystemBuildContext;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
import org.apache.maven.settings.validation.SettingsValidationResult;
@ -183,19 +182,4 @@ public class DefaultMavenSettingsBuilder
throw new IOException( "Failed to validate Settings file at " + location + "\n" + validationResult.render( "\n" ) );
}
}
/**
* @return a <code>Settings</code> object from the user and global settings file.
* @throws IOException if any
* @throws XmlPullParserException if any
* @deprecated Use {@link org.apache.maven.settings.MavenSettingsBuilder#buildSettings(java.io.File,java.io.File)} instead.
*/
public Settings buildSettings()
throws IOException, XmlPullParserException
{
String mavenHome = System.getProperty( "maven.home" );
String userHome = System.getProperty( "user.home" );
return buildSettings( new File( userHome, ".m2/settings.xml" ), new File( mavenHome, "conf/settings.xml" ) );
}
}

9
maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
View File

@ -38,15 +38,6 @@ public interface MavenSettingsBuilder
{
String ROLE = MavenSettingsBuilder.class.getName();
/**
* @return a <code>Settings</code> object from the user and global settings file.
* @throws IOException if any
* @throws XmlPullParserException if any
* @deprecated Use {@link org.apache.maven.settings.MavenSettingsBuilder#buildSettings(java.io.File,java.io.File)} instead.
*/
Settings buildSettings()
throws IOException, XmlPullParserException;
/**
*
* @param userSettingsFile