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

remove the 'unused' var for plugin artifact resolution. When they're resolved, all core artifacts are already removed from the resolutiongroups' result. Why add them back again later? 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497838 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2007-01-19 15:08:08 +00:00
parent 753ccae2af
commit 11a88e90f5
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -340,7 +340,7 @@ public class DefaultPluginManager
pluginDescriptor.setArtifacts( new ArrayList( artifacts ) );
getLogger().debug( "Realm for plugin: " + plugin.getKey() + ":\n" + componentRealm );
pluginDescriptor.setClassRealm( componentRealm );
}
@ -392,9 +392,9 @@ public class DefaultPluginManager
coreArtifactFilterManager.getArtifactFilter() );
List resolved = new ArrayList( result.getArtifacts() );
getLogger().info( "Main plugin artifacts: " + resolved );
getLogger().info( "Main plugin artifacts: " + resolved.toString().replace( ',', '\n' ) );
// Also resolve the plugin dependencies specified in <plugin><dependencies>:
resolved.addAll( artifactResolver.resolveTransitively( projectPluginDependencies,
pluginArtifact,
@ -402,9 +402,9 @@ public class DefaultPluginManager
repositories,
artifactMetadataSource,
coreArtifactFilterManager.getArtifactFilter() ).getArtifacts() );
getLogger().info( "After adding project-level plugin dependencies: " + resolved );
getLogger().info( "After adding project-level plugin dependencies: " + resolved.toString().replace( ',', '\n' ) );
for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
@ -415,20 +415,20 @@ public class DefaultPluginManager
}
}
List unresolved = new ArrayList( dependencies );
// List unresolved = new ArrayList();// dependencies );
unresolved.removeAll( resolved );
// unresolved.removeAll( resolved );
resolveCoreArtifacts( unresolved, localRepository, resolutionGroup.getResolutionRepositories() );
// resolveCoreArtifacts( unresolved, localRepository, resolutionGroup.getResolutionRepositories() );
Set allResolved = new LinkedHashSet( resolved.size() ); // + unresolved.size() );
Set allResolved = new LinkedHashSet( resolved.size() + unresolved.size() );
Set seenVersionlessKeys = new HashSet();
for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
Artifact resolvedArtifact = (Artifact) it.next();
String versionlessKey = ArtifactUtils.versionlessKey( resolvedArtifact );
if ( !seenVersionlessKeys.contains( versionlessKey ) )
{
@ -440,23 +440,23 @@ public class DefaultPluginManager
getLogger().info( "NOT including: " + resolvedArtifact.getId() + " in plugin dependencies." );
}
}
for ( Iterator it = unresolved.iterator(); it.hasNext(); )
{
Artifact unresolvedArtifact = (Artifact) it.next();
String versionlessKey = ArtifactUtils.versionlessKey( unresolvedArtifact );
if ( !seenVersionlessKeys.contains( versionlessKey ) )
{
allResolved.add( unresolvedArtifact );
seenVersionlessKeys.add( versionlessKey );
}
else
{
getLogger().info( "NOT including: " + unresolvedArtifact.getId() + " in plugin dependencies." );
}
}
// for ( Iterator it = unresolved.iterator(); it.hasNext(); )
// {
// Artifact unresolvedArtifact = (Artifact) it.next();
//
// String versionlessKey = ArtifactUtils.versionlessKey( unresolvedArtifact );
// if ( !seenVersionlessKeys.contains( versionlessKey ) )
// {
// allResolved.add( unresolvedArtifact );
// seenVersionlessKeys.add( versionlessKey );
// }
// else
// {
// getLogger().info( "NOT including: " + unresolvedArtifact.getId() + " in plugin dependencies." );
// }
// }
getLogger().info( "Using the following artifacts for classpath of: " + pluginArtifact.getId() + ":\n\n" + allResolved.toString().replace( ',', '\n' ) );
return allResolved;