maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r892499 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
Date Sat, 19 Dec 2009 19:11:12 GMT
Author: olamy
Date: Sat Dec 19 19:11:12 2009
New Revision: 892499

URL: http://svn.apache.org/viewvc?rev=892499&view=rev
Log:
[MRELEASE-461] Add a mojo parameter for using the new remote tagging for svn scm provider
(to prevent issue with svn > 1.5.0) in branch mojo

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=892499&r1=892498&r2=892499&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
Sat Dec 19 19:11:12 2009
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.scm.ScmBranchParameters;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.branch.BranchScmResult;
@@ -85,8 +86,13 @@
         {
             ScmFileSet fileSet = new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory()
) );
             String branchName = releaseDescriptor.getScmReleaseLabel();
-            result = provider.branch( repository, fileSet, branchName,
-                                      releaseDescriptor.getScmCommentPrefix() + " copy for
branch " + branchName );
+            
+            ScmBranchParameters scmBranchParameters = new ScmBranchParameters();
+            scmBranchParameters.setMessage( releaseDescriptor.getScmCommentPrefix() + " copy
for branch " + branchName );
+            scmBranchParameters.setRemoteBranching( releaseDescriptor.isRemoteTagging() );
+            scmBranchParameters.setScmRevision( releaseDescriptor.getScmReleasedPomRevision()
);
+            
+            result = provider.branch( repository, fileSet, branchName, scmBranchParameters);
         }
         catch ( ScmException e )
         {



Mime
View raw message