Author: evenisse
Date: Tue Nov 29 02:02:53 2005
New Revision: 349692
URL: http://svn.apache.org/viewcvs?rev=349692&view=rev
Log:
Fix error message
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=349692&r1=349691&r2=349692&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Tue Nov 29 02:02:53 2005
@@ -444,7 +444,7 @@
if ( releaseProgress.getUsername() == null ||
releaseProgress.getScmUrl() == null )
{
- throw new MojoExecutionException( "Missing release preparation
information." );
+ throw new MojoExecutionException( "Missing release preparation
information (Scm url)." );
}
}
return releaseProgress;
@@ -1304,7 +1304,8 @@
project = (MavenProject) reactorProjects.get(0);
for (int i = 1; i < reactorProjects.size(); i++ )
{
- if (! ((MavenProject) reactorProjects.get( i )
).getParent().equals( project ))
+ MavenProject parent = ( (MavenProject) reactorProjects.get( i )
).getParent();
+ if (parent != null && !parent.equals( project ))
{
// We have multiple projects, some of which are not
descendants of the 0th project in the list.
// rather than guess which one we should use for a default tag
name, just return null
