commit 1e522133b26e1744c85067c1d8cd3bb13958f8fc
author Herve Boutemy <hboutemy@apache.org> Sun May 04 08:42:15 2014 +0000
committer Herve Boutemy <hboutemy@apache.org> Sun May 04 08:42:15 2014 +0000
tree cdc5c84971969ff3f4711248c73dfa13fcae1584
parent 3c84b1b78f6d893396b0a28fed8fb91ccbbd9a1c

[MSCMPUB-12] use scmBranch when tryUpdate is specified too

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1592321 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index bd29744..62179e9 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -404,7 +404,15 @@
             ScmResult scmResult = null;
             if ( tryUpdate && !forceCheckout )
             {
-                scmResult = scmProvider.update( scmRepository, fileSet );
+                if ( scmBranch == null )
+                {
+                    scmResult = scmProvider.update( scmRepository, fileSet );
+                }
+                else
+                {
+                    ScmBranch scmBranch = new ScmBranch( this.scmBranch );
+                    scmResult = scmProvider.update( scmRepository, fileSet, scmBranch );
+                }
             }
             else
             {