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 2010/08/20 18:53:39 UTC
svn commit: r987570 -
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
Author: bentmann
Date: Fri Aug 20 16:53:39 2010
New Revision: 987570
URL: http://svn.apache.org/viewvc?rev=987570&view=rev
Log:
[MNG-4771] [regression] Plugin prefix resolution ignores enabled flags on repository
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java?rev=987570&r1=987569&r2=987570&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java Fri Aug 20 16:53:39 2010
@@ -180,6 +180,12 @@ public class DefaultPluginPrefixResolver
{
for ( ArtifactRepository repository : request.getRemoteRepositories() )
{
+ if ( !isEnabled( repository ) )
+ {
+ logger.debug( "Skipped plugin prefix lookup from disabled repository " + repository.getId() );
+ continue;
+ }
+
String localPath = getLocalMetadataPath( pluginGroup, repository );
File groupMetadataFile = new File( localRepository.getBasedir(), localPath );
@@ -286,6 +292,11 @@ public class DefaultPluginPrefixResolver
return null;
}
+ private boolean isEnabled( ArtifactRepository repository )
+ {
+ return repository.getReleases().isEnabled() || repository.getSnapshots().isEnabled();
+ }
+
private PluginPrefixResult resolveFromRepository( PluginPrefixRequest request, String pluginGroup,
File metadataFile, ArtifactRepository repository )
{