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

o cleaning up more dead code in the hunt for "why the release plugin doesn't work again" 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572877 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-09-05 05:30:26 +00:00
parent 4925ac9702
commit c1f56fc847
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@ -480,12 +479,12 @@ public class DefaultPluginManager
repositories.addAll( project.getRemoteArtifactRepositories() );
ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, pluginArtifact,
project.getManagedVersionMap(),
Collections.EMPTY_MAP,
localRepository, repositories,
artifactMetadataSource,
coreArtifactFilterManager.getArtifactFilter() );
List resolved = new ArrayList( result.getArtifacts() );
Set resolved = new HashSet( result.getArtifacts() );
for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
@ -497,33 +496,9 @@ public class DefaultPluginManager
}
}
// This code below removes dependencies added by the project
// with the same group/artifactId as those specified
// by the plugin itself.
getLogger().debug( "Using the following artifacts for classpath of: " + pluginArtifact.getId() + ":\n\n" + resolved.toString().replace( ',', '\n' ) );
Set allResolved = new LinkedHashSet( resolved.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 ) )
{
allResolved.add( resolvedArtifact );
seenVersionlessKeys.add( versionlessKey );
}
else
{
getLogger().warn( "NOT including: " + resolvedArtifact.getId() + " in plugin dependencies." );
}
}
getLogger().debug( "Using the following artifacts for classpath of: " + pluginArtifact.getId() + ":\n\n" + allResolved.toString().replace( ',', '\n' ) );
return allResolved;
return resolved;
}
// ----------------------------------------------------------------------
@ -612,8 +587,6 @@ public class DefaultPluginManager
try
{
//ClassRealm pluginRealm = container.getComponentRealm( )
Thread.currentThread().setContextClassLoader( pluginRealm );
ClassRealm oldRealm = container.setLookupRealm( pluginRealm );
@ -1270,7 +1243,7 @@ public class DefaultPluginManager
}
ArtifactResolutionResult result = artifactResolver.resolveTransitively( project.getDependencyArtifacts(),
artifact,
project.getManagedVersionMap(),
Collections.EMPTY_MAP,
context.getLocalRepository(),
project.getRemoteArtifactRepositories(),
artifactMetadataSource, filter );