You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/05/30 16:00:41 UTC
svn commit: r1682606 -
/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
Author: rfscholte
Date: Sat May 30 14:00:40 2015
New Revision: 1682606
URL: http://svn.apache.org/r1682606
Log:
Simplify code, also required since M3.0 throws java.lang.NoSuchMethodError: org.codehaus.plexus.PlexusContainer.hasComponent(Ljava/lang/String;Ljava/lang/String;)Z
Modified:
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1682606&r1=1682605&r2=1682606&view=diff
==============================================================================
--- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java (original)
+++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java Sat May 30 14:00:40 2015
@@ -709,19 +709,12 @@ public class DefaultRepositoryAssembler
for ( String hint : PREFERRED_RESOLVER_HINTS )
{
- if ( container.hasComponent( ArtifactResolver.ROLE, hint ) )
+ try
{
- try
- {
- artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, hint );
- break;
- }
- catch ( ComponentLookupException e )
- {
- getLogger().warn( "Cannot find ArtifactResolver with hint: " + hint, e );
- }
+ artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, hint );
+ break;
}
- else
+ catch ( ComponentLookupException e )
{
getLogger().debug( "No ArtifactResolver with hint " + hint );
}