mirror of https://github.com/apache/maven.git
o have very much simplified the use of settings use so the settings advice is not required as it is the job
of the client using the embedder to decide the semantics of use. some uses may have only one settings file, some may have five and some may have none. trying to move away from hardwired usage patterns for the embedder. the cli is now responsible for dealing with what is now standard insofar as user and global settings. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512544 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9783df0a61
commit
7bdf0a8d5d
|
@ -18,9 +18,8 @@ package org.apache.maven.execution;
|
||||||
|
|
||||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||||
import org.apache.maven.monitor.event.EventMonitor;
|
import org.apache.maven.monitor.event.EventMonitor;
|
||||||
import org.apache.maven.settings.Settings;
|
|
||||||
import org.apache.maven.settings.SettingsBuilderAdvice;
|
|
||||||
import org.apache.maven.wagon.events.TransferListener;
|
import org.apache.maven.wagon.events.TransferListener;
|
||||||
|
import org.apache.maven.settings.Settings;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -35,14 +34,6 @@ import java.util.Properties;
|
||||||
public class DefaultMavenExecutionRequest
|
public class DefaultMavenExecutionRequest
|
||||||
implements MavenExecutionRequest
|
implements MavenExecutionRequest
|
||||||
{
|
{
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// Settings equivalents
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
private Settings settings;
|
|
||||||
|
|
||||||
private String settingsFile;
|
|
||||||
|
|
||||||
private ArtifactRepository localRepository;
|
private ArtifactRepository localRepository;
|
||||||
|
|
||||||
private File localRepositoryPath;
|
private File localRepositoryPath;
|
||||||
|
@ -108,24 +99,6 @@ public class DefaultMavenExecutionRequest
|
||||||
*/
|
*/
|
||||||
private boolean noSnapshotUpdates;
|
private boolean noSnapshotUpdates;
|
||||||
|
|
||||||
private SettingsBuilderAdvice advice;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
public String getSettingsFile()
|
|
||||||
{
|
|
||||||
return settingsFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MavenExecutionRequest setSettingsFile( String settingsFile )
|
|
||||||
{
|
|
||||||
this.settingsFile = settingsFile;
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getBaseDirectory()
|
public String getBaseDirectory()
|
||||||
{
|
{
|
||||||
if ( basedir == null )
|
if ( basedir == null )
|
||||||
|
@ -136,11 +109,6 @@ public class DefaultMavenExecutionRequest
|
||||||
return basedir.getAbsolutePath();
|
return basedir.getAbsolutePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Settings getSettings()
|
|
||||||
{
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArtifactRepository getLocalRepository()
|
public ArtifactRepository getLocalRepository()
|
||||||
{
|
{
|
||||||
return localRepository;
|
return localRepository;
|
||||||
|
@ -269,13 +237,6 @@ public class DefaultMavenExecutionRequest
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MavenExecutionRequest setSettings( Settings settings )
|
|
||||||
{
|
|
||||||
this.settings = settings;
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MavenExecutionRequest setGoals( List goals )
|
public MavenExecutionRequest setGoals( List goals )
|
||||||
{
|
{
|
||||||
this.goals = goals;
|
this.goals = goals;
|
||||||
|
@ -514,8 +475,6 @@ public class DefaultMavenExecutionRequest
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
public MavenExecutionRequest setRecursive( boolean recursive )
|
public MavenExecutionRequest setRecursive( boolean recursive )
|
||||||
{
|
{
|
||||||
this.recursive = recursive;
|
this.recursive = recursive;
|
||||||
|
@ -523,16 +482,17 @@ public class DefaultMavenExecutionRequest
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SettingsBuilderAdvice getSettingsBuilderAdvice()
|
private Settings settings;
|
||||||
{
|
|
||||||
return advice;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MavenExecutionRequest setSettingsBuilderAdvice( SettingsBuilderAdvice advice )
|
public MavenExecutionRequest setSettings( Settings settings )
|
||||||
{
|
{
|
||||||
this.advice = advice;
|
this.settings = settings;
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Settings getSettings()
|
||||||
|
{
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue