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

o adding runtime info to the settings adapter 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731173 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-01-04 04:43:10 +00:00
parent ac091b558c
commit 59e207e530
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -35,8 +35,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@ -322,10 +320,7 @@ public class MavenEmbedder
PluginNotFoundException, PluginVersionNotFoundException
{
PluginManager pluginManager = container.lookup( PluginManager.class );
// MavenSession session = new MavenSession( container, request, null, null, projectSessions );
MavenSession session = new MavenSession( container, request, null, null );
pluginManager.verifyPlugin( plugin, project, session );
}

8
maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
View File

@ -20,6 +20,7 @@ package org.apache.maven.embedder.execution;
*/
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.settings.RuntimeInfo;
import org.apache.maven.settings.Settings;
import java.util.List;
@ -37,11 +38,13 @@ public class SettingsAdapter
{
private MavenExecutionRequest request;
private Settings settings;
private RuntimeInfo runtimeInfo;
public SettingsAdapter( MavenExecutionRequest request, Settings settings )
{
this.request = request;
this.settings = settings;
this.runtimeInfo = new RuntimeInfo( request.getUserSettingsFile() );
}
public String getLocalRepository()
@ -95,4 +98,9 @@ public class SettingsAdapter
{
return settings.getPluginGroups();
}
public RuntimeInfo getRuntimeInfo()
{
return runtimeInfo;
}
}