You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/10 22:03:29 UTC
svn commit: r783480 - in /maven/components/trunk/maven-core/src:
main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/project/
test/java/org/apache/maven/plugin/
Author: bentmann
Date: Wed Jun 10 20:03:29 2009
New Revision: 783480
URL: http://svn.apache.org/viewvc?rev=783480&view=rev
Log:
[MNG-4191] separate plugin and artifact repositories
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=783480&r1=783479&r2=783480&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Wed Jun 10 20:03:29 2009
@@ -249,7 +249,7 @@
// org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
//
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(), session
- .getLocalRepository(), project.getRemoteArtifactRepositories() );
+ .getLocalRepository(), project.getPluginArtifactRepositories() );
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
if ( pluginDescriptor.getPlugin().isExtensions() )
@@ -402,7 +402,7 @@
{
for ( String goal : execution.getGoals() )
{
- MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), project.getRemoteArtifactRepositories() );
+ MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), project.getPluginArtifactRepositories() );
if ( mojoDescriptor.getPhase() != null && phaseToMojoMapping.get( mojoDescriptor.getPhase() ) != null )
{
@@ -673,7 +673,7 @@
//
//TODO: we should cycle through the repositories but take the repository which actually
// satisfied the prefix.
- for ( ArtifactRepository repository : project.getRemoteArtifactRepositories() )
+ for ( ArtifactRepository repository : project.getPluginArtifactRepositories() )
{
localPath = plugin.getGroupId().replace( '.', '/' ) + "/" + plugin.getArtifactId() + "/maven-metadata-" + repository.getId() + ".xml";
@@ -733,7 +733,7 @@
}
}
- return pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), project.getRemoteArtifactRepositories() );
+ return pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), project.getPluginArtifactRepositories() );
}
private String attemptToGetPluginVersionFromProject( Plugin plugin, MavenProject project )
@@ -999,7 +999,7 @@
//
for ( String pluginGroup : session.getPluginGroups() )
{
- for ( ArtifactRepository repository : session.getCurrentProject().getRemoteArtifactRepositories() )
+ for ( ArtifactRepository repository : session.getCurrentProject().getPluginArtifactRepositories() )
{
try
{
@@ -1032,7 +1032,7 @@
}
- throw new NoPluginFoundForPrefixException( prefix, session.getLocalRepository(), session.getCurrentProject().getRemoteArtifactRepositories() );
+ throw new NoPluginFoundForPrefixException( prefix, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
}
// Keep track of the repository that provided the prefix mapping
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=783480&r1=783479&r2=783480&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Jun 10 20:03:29 2009
@@ -124,7 +124,7 @@
{
if ( configuration.isProcessPlugins() )
{
- lifecycle.populateDefaultConfigurationForPlugins( model.getBuild().getPlugins(), configuration.getLocalRepository(), project.getRemoteArtifactRepositories() );
+ lifecycle.populateDefaultConfigurationForPlugins( model.getBuild().getPlugins(), configuration.getLocalRepository(), project.getPluginArtifactRepositories() );
}
}
catch ( LifecycleExecutionException e )
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=783480&r1=783479&r2=783480&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Wed Jun 10 20:03:29 2009
@@ -106,6 +106,8 @@
private List<ArtifactRepository> remoteArtifactRepositories;
+ private List<ArtifactRepository> pluginArtifactRepositories;
+
private List<Artifact> attachedArtifacts;
private MavenProject executionProject;
@@ -244,11 +246,14 @@
}
}
+
+ pluginArtifactRepositories = new ArrayList<ArtifactRepository>();
+
for ( Repository r : model.getPluginRepositories() )
{
try
{
- remoteArtifactRepositories.add( repositorySystem.buildArtifactRepository( r ) );
+ pluginArtifactRepositories.add( repositorySystem.buildArtifactRepository( r ) );
}
catch ( InvalidRepositoryException e )
{
@@ -262,6 +267,8 @@
{
remoteArtifactRepositories.addAll( projectBuilderConfiguration.getRemoteRepositories() );
}
+
+ pluginArtifactRepositories = repositorySystem.getMirrors( pluginArtifactRepositories );
}
// TODO: Find a way to use <relativePath/> here...it's tricky, because the moduleProject
@@ -390,7 +397,7 @@
public List<ArtifactRepository> getRemoteArtifactRepositories()
{
- return new ArrayList<ArtifactRepository>( remoteArtifactRepositories );
+ return remoteArtifactRepositories;
}
public boolean hasParent()
@@ -1350,6 +1357,7 @@
public void setPluginArtifactRepositories( List<ArtifactRepository> pluginArtifactRepositories )
{
+ this.pluginArtifactRepositories = pluginArtifactRepositories;
}
/**
@@ -1358,7 +1366,7 @@
*/
public List<ArtifactRepository> getPluginArtifactRepositories()
{
- return getRemoteArtifactRepositories();
+ return pluginArtifactRepositories;
}
public ArtifactRepository getDistributionManagementArtifactRepository()
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=783480&r1=783479&r2=783480&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java Wed Jun 10 20:03:29 2009
@@ -47,7 +47,7 @@
plugin.setGroupId( "org.codehaus.plexus" );
plugin.setArtifactId( "plexus-component-metadata" );
plugin.setVersion( plexusVersion );
- PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin, session.getLocalRepository(), session.getCurrentProject().getRemoteArtifactRepositories() );
+ PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
assertNotNull( pluginDescriptor );
}
@@ -61,7 +61,7 @@
plugin.setArtifactId( "plexus-component-metadata" );
plugin.setVersion( plexusVersion );
- MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getRemoteArtifactRepositories() );
+ MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
assertNotNull( mojoDescriptor );
assertEquals( "generate-metadata", mojoDescriptor.getGoal() );
// igorf: plugin realm comes later