commit fc82bced148044a9a0124291117f5d3a068a6ee1
author Robert Scholte <rfscholte@apache.org> Sat May 30 14:00:40 2015 +0000
committer Robert Scholte <rfscholte@apache.org> Sat May 30 14:00:40 2015 +0000
tree d74e18c238adb4c4928f49b90d568a11f7614ef6
parent 8568988862244ecfa54f08749a1b4c2be5eab060

Simplify code, also required since M3.0 throws java.lang.NoSuchMethodError: org.codehaus.plexus.PlexusContainer.hasComponent(Ljava/lang/String;Ljava/lang/String;)Z

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1682606 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

diff --git a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
index f2ecc0c..53583db 100644
--- a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
@@ -709,19 +709,12 @@
 
         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 );
             }