You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/13 18:37:24 UTC

svn commit: r320797 [2/2] - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/cli/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/lifecycle/ ...

Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=320797&r1=320796&r2=320797&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Thu Oct 13 09:36:54 2005
@@ -32,9 +32,11 @@
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.Reporting;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.plugin.InvalidPluginException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.version.PluginVersionManager;
+import org.apache.maven.plugin.version.PluginVersionNotFoundException;
 import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.plugins.release.helpers.ProjectScmRewriter;
 import org.apache.maven.plugins.release.helpers.ProjectVersionResolver;
@@ -940,9 +942,17 @@
                         }
                         catch ( PluginVersionResolutionException e )
                         {
-                            getLog().debug( "Error resolving plugin version", e );
-                            throw new MojoFailureException(
-                                "Cannot resolve version for plugin '" + plugin.getKey() + "': " + e.getMessage() );
+                            throw new MojoExecutionException(
+                                "Cannot resolve version for plugin '" + plugin.getKey() + "': " + e.getMessage(), e );
+                        }
+                        catch ( InvalidPluginException e )
+                        {
+                            throw new MojoExecutionException(
+                                "Cannot resolve version for plugin '" + plugin.getKey() + "': " + e.getMessage(), e );
+                        }
+                        catch ( PluginVersionNotFoundException e )
+                        {
+                            throw new MojoFailureException( e.getMessage() );
                         }
 
                         if ( ArtifactUtils.isSnapshot( version ) )
@@ -977,9 +987,17 @@
                         }
                         catch ( PluginVersionResolutionException e )
                         {
-                            getLog().debug( "Error resolving report version", e );
-                            throw new MojoFailureException(
-                                "Cannot resolve version for report '" + plugin.getKey() + "': " + e.getMessage() );
+                            throw new MojoExecutionException(
+                                "Cannot resolve version for report '" + plugin.getKey() + "': " + e.getMessage(), e );
+                        }
+                        catch ( InvalidPluginException e )
+                        {
+                            throw new MojoExecutionException(
+                                "Cannot resolve version for plugin '" + plugin.getKey() + "': " + e.getMessage(), e );
+                        }
+                        catch ( PluginVersionNotFoundException e )
+                        {
+                            throw new MojoFailureException( e.getMessage() );
                         }
 
                         if ( ArtifactUtils.isSnapshot( version ) )