Author: rfscholte
Date: Wed May 30 21:53:14 2012
New Revision: 1344483
URL: http://svn.apache.org/viewvc?rev=1344483&view=rev
Log:
Fix MRELEASE-765: release:update-versions doesn't work anymore
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=1344483&r1=1344482&r2=1344483&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
Wed May 30 21:53:14 2012
@@ -522,6 +522,8 @@ public class DefaultReleaseManager
updateVersionsRequest.setReleaseDescriptor( releaseDescriptor );
updateVersionsRequest.setReleaseEnvironment( releaseEnvironment );
updateVersionsRequest.setReactorProjects( reactorProjects );
+
+ updateVersions( updateVersionsRequest );
}
/** {@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=1344483&r1=1344482&r2=1344483&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
Wed May 30 21:53:14 2012
@@ -56,6 +56,7 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.ReflectionUtils;
/**
* Test the default release manager.
@@ -924,4 +925,26 @@ public class DefaultReleaseManagerTest
FileUtils.forceDelete( checkoutDir );
}
+
+ // MRELEASE-765
+ @SuppressWarnings( "unchecked" )
+ public void testUpdateVersionsCall()
+ throws Exception
+ {
+ DefaultReleaseManager defaultReleaseManager = (DefaultReleaseManager)
lookup( ReleaseManager.ROLE, "test" );
+
+ ReleasePhase updateVersionsPhase1 = mock( ReleasePhase.class );
+ ReflectionUtils.setVariableValueInObject( defaultReleaseManager,
"updateVersionsPhases",
+ Collections.singletonList(
"updateVersionsPhase1" ) );
+ Map<String, ReleasePhase> releasePhases =
+ (Map<String, ReleasePhase>)
ReflectionUtils.getValueIncludingSuperclasses( "releasePhases",
+
defaultReleaseManager );
+ releasePhases.put( "updateVersionsPhase1", updateVersionsPhase1 );
+
+ defaultReleaseManager.updateVersions(
configStore.getReleaseConfiguration(), null, null );
+
+ verify( updateVersionsPhase1 ).execute( any( ReleaseDescriptor.class
), any( ReleaseEnvironment.class ),
+ any( List.class ) );
+ verifyNoMoreInteractions( updateVersionsPhase1 );
+ }
}
\ No newline at end of file
