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

[rfscholte]

Author: rfscholte
Date: Tue Dec 11 20:25:31 2012
New Revision: 1420386

URL: http://svn.apache.org/viewvc?rev=1420386&view=rev
Log:
Fix finalName resolution for M2 too

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

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1420386&r1=1420385&r2=1420386&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
 Tue Dec 11 20:25:31 2012
@@ -236,7 +236,7 @@ public class GenerateReleasePomsPhase
         // update final name if implicit
         if ( !FINALNAME_EXPRESSION.equals( 
releaseModel.getBuild().getFinalName() ) )
         {
-            String originalFinalName = findOriginalFinalName( releaseProject );
+            String originalFinalName = findOriginalFinalName( project );
             
             if( originalFinalName == null )
             {
@@ -296,7 +296,6 @@ public class GenerateReleasePomsPhase
         return releaseModel;
     }
     
-    // finalName is inherited
     private String findOriginalFinalName( MavenProject project )
     {
         if ( project.getOriginalModel().getBuild() != null && 
project.getOriginalModel().getBuild().getFinalName() != null )