argh too fast. (I have it locally :-) ) IMHO we have to align maven version in release-manager too.
2010/1/26 <[email protected]>: > Author: brett > Date: Tue Jan 26 15:01:26 2010 > New Revision: 903251 > > URL: http://svn.apache.org/viewvc?rev=903251&view=rev > Log: > [MRELEASE-515] release:prepare eats the root cause of the exception. Upgraded > Maven prerequisite to 2.0.9 > > Modified: > maven/release/trunk/maven-release-plugin/pom.xml > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java > > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java > > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java > > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java > > Modified: maven/release/trunk/maven-release-plugin/pom.xml > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- maven/release/trunk/maven-release-plugin/pom.xml (original) > +++ maven/release/trunk/maven-release-plugin/pom.xml Tue Jan 26 15:01:26 2010 > @@ -29,7 +29,6 @@ > > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-release-plugin</artifactId> > - <version>2.0-SNAPSHOT</version> > <packaging>maven-plugin</packaging> > > <name>Maven Release Plugin</name> > @@ -37,11 +36,11 @@ > <url>http://maven.apache.org/plugins/maven-release-plugin/</url> > > <prerequisites> > - <maven>2.0.6</maven> > + <maven>2.0.9</maven> > </prerequisites> > > <properties> > - <mavenVersion>2.0.6</mavenVersion> > + <mavenVersion>2.0.9</mavenVersion> > </properties> > > <issueManagement> > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java > Tue Jan 26 15:01:26 2010 > @@ -183,7 +183,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > } > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java > Tue Jan 26 15:01:26 2010 > @@ -136,7 +136,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > } > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java > Tue Jan 26 15:01:26 2010 > @@ -204,7 +204,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java > Tue Jan 26 15:01:26 2010 > @@ -60,7 +60,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java > Tue Jan 26 15:01:26 2010 > @@ -154,7 +154,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > } > > Modified: > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java > Tue Jan 26 15:01:26 2010 > @@ -110,7 +110,7 @@ > } > catch ( ReleaseFailureException e ) > { > - throw new MojoFailureException( e.getMessage() ); > + throw new MojoFailureException( e.getMessage(), e ); > } > } > > > Modified: > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java > Tue Jan 26 15:01:26 2010 > @@ -206,8 +206,9 @@ > new IsNull() > }; > > + ReleaseFailureException cause = new ReleaseFailureException( "..." ); > mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( > constraints ).will( > - new ThrowStub( new ReleaseFailureException( "..." ) ) ); > + new ThrowStub( cause ) ); > mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); > > try > @@ -218,7 +219,7 @@ > } > catch ( MojoFailureException e ) > { > - assertNull( "Check no cause", e.getCause() ); > + assertEquals( "Check cause exists", cause, e.getCause() ); > } > } > > > Modified: > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java > URL: > http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java?rev=903251&r1=903250&r2=903251&view=diff > ============================================================================== > --- > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java > (original) > +++ > maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java > Tue Jan 26 15:01:26 2010 > @@ -19,6 +19,9 @@ > * under the License. > */ > > +import java.io.File; > +import java.util.Properties; > + > import org.apache.maven.execution.MavenSession; > import org.apache.maven.plugin.MojoExecutionException; > import org.apache.maven.plugin.MojoFailureException; > @@ -36,9 +39,6 @@ > import org.jmock.core.matcher.InvokeOnceMatcher; > import org.jmock.core.stub.ThrowStub; > > -import java.io.File; > -import java.util.Properties; > - > /** > * Test release:prepare. > * > @@ -150,8 +150,9 @@ > new IsEqual( Boolean.FALSE ) > }; > > + ReleaseFailureException cause = new ReleaseFailureException( "..." ); > mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( > constraints ).will( > - new ThrowStub( new ReleaseFailureException( "..." ) ) ); > + new ThrowStub( cause ) ); > mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); > > try > @@ -162,7 +163,7 @@ > } > catch ( MojoFailureException e ) > { > - assertNull( "Check no cause", e.getCause() ); > + assertEquals( "Check cause exists", cause, e.getCause() ); > } > } > > > > -- Olivier http://twitter.com/olamy http://fr.linkedin.com/in/olamy --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
