You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/09/29 16:11:49 UTC

svn commit: r1002638 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java

Author: brett
Date: Wed Sep 29 14:11:49 2010
New Revision: 1002638

URL: http://svn.apache.org/viewvc?rev=1002638&view=rev
Log:
[MRELEASE-586] The temporary file "pom.xml.branch" should be ignored as "pom.xml.next" and "pom.xml.tag" are ignored
Submitted by: Lars Corneliussen

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1002638&r1=1002637&r2=1002638&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Wed Sep 29 14:11:49 2010
@@ -65,7 +65,7 @@ public class ScmCheckModificationsPhase
      * @todo proper construction of filenames, especially release properties
      */
     private Set excludedFiles = new HashSet( Arrays.asList( new String[] { "pom.xml.backup", "pom.xml.tag",
-        "pom.xml.next", "release.properties", "pom.xml.releaseBackup" } ) );
+        "pom.xml.next", "pom.xml.branch", "release.properties", "pom.xml.releaseBackup" } ) );
 
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException