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 2009/01/04 05:43:11 UTC
svn commit: r731173 - in
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder:
MavenEmbedder.java execution/SettingsAdapter.java
Author: jvanzyl
Date: Sat Jan 3 20:43:10 2009
New Revision: 731173
URL: http://svn.apache.org/viewvc?rev=731173&view=rev
Log:
o adding runtime info to the settings adapter
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=731173&r1=731172&r2=731173&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Jan 3 20:43:10 2009
@@ -35,8 +35,6 @@
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 @@
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 );
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java?rev=731173&r1=731172&r2=731173&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java Sat Jan 3 20:43:10 2009
@@ -20,6 +20,7 @@
*/
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 @@
{
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 @@
{
return settings.getPluginGroups();
}
+
+ public RuntimeInfo getRuntimeInfo()
+ {
+ return runtimeInfo;
+ }
}