svn commit: r775975 - /maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java

[ni...@apache.org]

Author: nicolas
Date: Mon May 18 14:50:13 2009
New Revision: 775975

URL: http://svn.apache.org/viewvc?rev=775975&view=rev
Log:
use more appropriate DependencyResolutionRequiredException

Modified:
    maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java

Modified: maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java?rev=775975&r1=775974&r2=775975&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java (original)
+++ maven/sandbox/trunk/shared/maven-plugin-helper/src/main/java/org/apache/maven/shared/plugin/classloader/ProjectClassLoaderUtil.java Mon May 18 14:50:13 2009
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.return Collections.singletonList( artifact );n;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 
@@ -124,6 +125,10 @@
         {
             throw new MojoExecutionException( "Failed to resolve project dependencies as URL", e );
         }
+        catch ( DependencyResolutionRequiredException e )
+        {
+            throw new MojoExecutionException( "Failed to resolve project dependencies", e );
+        }
         return urls;
     }
 
@@ -132,7 +137,7 @@
      * @throws MalformedURLException
      */
     private static List buildProjectClasspath( MavenProject project, String scope, boolean includeSources )
-        throws MalformedURLException
+        throws MalformedURLException, DependencyResolutionRequiredException
     {
         List urls = new ArrayList();
 
@@ -169,8 +174,7 @@
             Artifact artifact = (Artifact) iterator.next();
             if ( !artifact.isResolved() )
             {
-                throw new IllegalStateException( "Artifact is not resolved. \n"
-                    + "Plugin must declare @requiresDependencyResolution " + scope );
+                throw new DependencyResolutionRequiredException( artifact );
             }
             urls.add( artifact.getFile().toURI().toURL() );
         }