You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2007/01/19 16:08:09 UTC
svn commit: r497838 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: kenney
Date: Fri Jan 19 07:08:08 2007
New Revision: 497838
URL: http://svn.apache.org/viewvc?view=rev&rev=497838
Log:
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?
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=497838&r1=497837&r2=497838
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Jan 19 07:08:08 2007
@@ -340,7 +340,7 @@
pluginDescriptor.setArtifacts( new ArrayList( artifacts ) );
getLogger().debug( "Realm for plugin: " + plugin.getKey() + ":\n" + componentRealm );
-
+
pluginDescriptor.setClassRealm( componentRealm );
}
@@ -392,9 +392,9 @@
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 @@
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 @@
}
}
- 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 @@
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;