Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 15770 invoked from network); 19 Dec 2009 18:43:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Dec 2009 18:43:34 -0000 Received: (qmail 23342 invoked by uid 500); 19 Dec 2009 18:43:34 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 23285 invoked by uid 500); 19 Dec 2009 18:43:33 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 23276 invoked by uid 99); 19 Dec 2009 18:43:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Dec 2009 18:43:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Dec 2009 18:43:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C08EB2388996; Sat, 19 Dec 2009 18:43:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r892495 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java Date: Sat, 19 Dec 2009 18:43:04 -0000 To: scm-commits@maven.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091219184304.C08EB2388996@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sat Dec 19 18:43:04 2009 New Revision: 892495 URL: http://svn.apache.org/viewvc?rev=892495&view=rev Log: [SCM-515] branch command must support remote branching (svnexe) add mojo parameter Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java?rev=892495&r1=892494&r2=892495&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java Sat Dec 19 18:43:04 2009 @@ -20,6 +20,7 @@ */ import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.scm.ScmBranchParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.command.branch.BranchScmResult; import org.apache.maven.scm.provider.ScmProvider; @@ -52,6 +53,16 @@ * @parameter expression="${message}" */ private String message; + + /** + * currently only implemented with svn scm. Enable a workaround to prevent issue + * due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406) + * + * + * @parameter expression="${remoteTagging}" default-value="true" + * @since 1.3 + */ + private boolean remoteBranching; /** {@inheritDoc} */ public void execute() @@ -67,7 +78,10 @@ String finalBranch = provider.sanitizeTagName( branch ); getLog().info( "Final Branch Name: '" + finalBranch + "'" ); - BranchScmResult result = provider.branch( repository, getFileSet(), finalBranch, message ); + ScmBranchParameters scmBranchParameters = new ScmBranchParameters( message ); + scmBranchParameters.setRemoteBranching( remoteBranching ); + + BranchScmResult result = provider.branch( repository, getFileSet(), finalBranch, scmBranchParameters ); checkResult( result ); }