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

[pg...@apache.org]

Author: pgier
Date: Wed Aug 19 14:28:56 2009
New Revision: 805818

URL: http://svn.apache.org/viewvc?rev=805818&view=rev
Log:
[MRELEASE-422] Only display the branch base scm URL if it is available.

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

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=805818&r1=805817&r2=805818&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java Wed Aug 19 14:28:56 2009
@@ -34,9 +34,11 @@
 import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
 import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
 import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
+import org.apache.maven.shared.release.scm.ScmTranslator;
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Branch the SCM repository.
@@ -54,6 +56,12 @@
      */
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
+    /**
+     * SCM URL translators mapped by provider name.  This is needed for writing out the
+     * branch URL.
+     */
+    private Map scmTranslators;
+
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -111,7 +119,10 @@
         validateConfiguration( releaseDescriptor );
 
         logInfo( result, "Full run would be branching " + releaseDescriptor.getWorkingDirectory() );
-        logInfo( result, "  To SCM URL: " + releaseDescriptor.getScmBranchBase() );
+        if ( releaseDescriptor.getScmBranchBase() != null )
+        {
+            logInfo( result, "  To SCM URL: " + releaseDescriptor.getScmBranchBase() );
+        }
         logInfo( result, "  with label: '" + releaseDescriptor.getScmReleaseLabel() + "'" );
 
         result.setResultCode( ReleaseResult.SUCCESS );
@@ -127,4 +138,5 @@
             throw new ReleaseFailureException( "A release label is required for committing" );
         }
     }
+    
 }