You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/12/06 20:14:51 UTC

svn commit: r354503 - /maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

Author: jdcasey
Date: Tue Dec  6 11:14:28 2005
New Revision: 354503

URL: http://svn.apache.org/viewcvs?rev=354503&view=rev
Log:
Fixing release-pom.xml handling...to ensure it's added/removed from SCM properly.

Modified:
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=354503&r1=354502&r2=354503&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Tue Dec  6 11:14:28 2005
@@ -1054,6 +1054,8 @@
 
                 try
                 {
+                    writePom( releasePomFile, releaseProject.getModel(), "release" );
+                    
                     writer = new FileWriter( releasePomFile );
 
                     releaseProject.writeModel( writer );
@@ -1239,6 +1241,8 @@
                     ScmHelper scm = getScm( basedir.getAbsolutePath() );
 
                     scm.remove( "Removing for next development iteration.", releasePomPath );
+                    
+                    pomFiles.remove( currentReleasePomFile );
 
                     currentReleasePomFile.delete();
                 }