svn commit: r805455 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/ test/java/org/apache/maven/shared/release/ test/resources/org/apache/maven/shared/release/

[pgier]

Author: pgier
Date: Tue Aug 18 15:35:43 2009
New Revision: 805455

URL: http://svn.apache.org/viewvc?rev=805455&view=rev
Log:
[MRELEASE-278] Release clean should clean up all temporary files generated by a 
dry run release:branch.  Patch from David Jencks.

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
    
maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/DefaultReleaseManagerTest.xml

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=805455&r1=805454&r2=805455&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
 Tue Aug 18 15:35:43 2009
@@ -25,6 +25,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.LinkedHashSet;
 
 import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -438,8 +440,10 @@
         getLogger().info( "Cleaning up after release..." );
 
         configStore.delete( releaseDescriptor );
+        Set phases = new LinkedHashSet(preparePhases);
+        phases.addAll(branchPhases);
 
-        for ( Iterator i = preparePhases.iterator(); i.hasNext(); )
+        for ( Iterator i = phases.iterator(); i.hasNext(); )
         {
             String name = (String) i.next();
 

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=805455&r1=805454&r2=805455&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
 Tue Aug 18 15:35:43 2009
@@ -386,6 +386,9 @@
 
         phase = (ReleasePhaseStub) phases.get( "step3" );
         assertTrue( "step3 not cleaned", phase.isCleaned() );
+
+        phase = (ReleasePhaseStub) phases.get( "branch1" );
+        assertTrue( "branch1 not cleaned", phase.isCleaned() );
     }
 
     public void testReleasePerform()

Modified: 
maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/DefaultReleaseManagerTest.xml
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/DefaultReleaseManagerTest.xml?rev=805455&r1=805454&r2=805455&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/DefaultReleaseManagerTest.xml
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/DefaultReleaseManagerTest.xml
 Tue Aug 18 15:35:43 2009
@@ -48,6 +48,9 @@
           <phase>checkout-project-from-scm</phase>
           <phase>run-perform-goals</phase>
         </performPhases>
+        <branchPhases>
+          <phase>branch1</phase>
+        </branchPhases>
       </configuration>
     </component>
     <component>
@@ -92,6 +95,11 @@
       
<implementation>org.apache.maven.shared.release.phase.ReleasePhaseStub</implementation>
     </component>
     <component>
+      <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
+      <role-hint>branch1</role-hint>
+      
<implementation>org.apache.maven.shared.release.phase.ReleasePhaseStub</implementation>
+    </component>
+    <component>
       <role>org.apache.maven.scm.manager.ScmManager</role>
       
<implementation>org.apache.maven.scm.manager.ScmManagerStub</implementation>
     </component>