You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/05/31 20:00:48 UTC
svn commit: r1344836 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
Author: rfscholte
Date: Thu May 31 18:00:48 2012
New Revision: 1344836
URL: http://svn.apache.org/viewvc?rev=1344836&view=rev
Log:
Fix MRELEASE-761: release:rollback no longer works
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1344836&r1=1344835&r2=1344836&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java Thu May 31 18:00:48 2012
@@ -274,6 +274,13 @@ public class DefaultReleaseManager
List<MavenProject> reactorProjects, ReleaseManagerListener listener )
throws ReleaseExecutionException, ReleaseFailureException
{
+ ReleaseRollbackRequest rollbackRequest = new ReleaseRollbackRequest();
+ rollbackRequest.setReleaseDescriptor( releaseDescriptor );
+ rollbackRequest.setReleaseEnvironment( releaseEnvironment );
+ rollbackRequest.setReactorProjects( reactorProjects );
+ rollbackRequest.setReleaseManagerListener( listener );
+
+ rollback( rollbackRequest );
}
/** {@inheritDoc} */
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java?rev=1344836&r1=1344835&r2=1344836&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java Thu May 31 18:00:48 2012
@@ -925,7 +925,30 @@ public class DefaultReleaseManagerTest
FileUtils.forceDelete( checkoutDir );
}
-
+
+ // MRELEASE-761
+ @SuppressWarnings( "unchecked" )
+ public void testRollbackCall()
+ throws Exception
+ {
+ DefaultReleaseManager defaultReleaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
+
+ ReleasePhase rollbackPhase1 = mock( ReleasePhase.class );
+ ReflectionUtils.setVariableValueInObject( defaultReleaseManager, "rollbackPhases",
+ Collections.singletonList( "rollbackPhase1" ) );
+ Map<String, ReleasePhase> releasePhases =
+ (Map<String, ReleasePhase>) ReflectionUtils.getValueIncludingSuperclasses( "releasePhases",
+ defaultReleaseManager );
+ releasePhases.put( "rollbackPhase1", rollbackPhase1 );
+
+ defaultReleaseManager.rollback( configStore.getReleaseConfiguration(), (ReleaseEnvironment) null, null );
+
+ verify( rollbackPhase1 ).execute( any( ReleaseDescriptor.class ), any( ReleaseEnvironment.class ),
+ any( List.class ) );
+ verifyNoMoreInteractions( rollbackPhase1 );
+ }
+
+
// MRELEASE-765
@SuppressWarnings( "unchecked" )
public void testUpdateVersionsCall()