Author: bimargulies
Date: Wed Sep 17 14:36:54 2014
New Revision: 1625613
URL: http://svn.apache.org/r1625613
Log:
MRELEASE-877: release:branch commit msg faulty
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.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=1625613&r1=1625612&r2=1625613&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 Sep 17 14:36:54 2014
@@ -100,7 +100,7 @@ public class ScmBranchPhase
String branchName = releaseDescriptor.getScmReleaseLabel();
ScmBranchParameters scmBranchParameters = new
ScmBranchParameters();
- scmBranchParameters.setMessage(
releaseDescriptor.getScmCommentPrefix() + " copy for branch " + branchName );
+ scmBranchParameters.setMessage(
releaseDescriptor.getScmCommentPrefix() + "copy for branch " + branchName );
scmBranchParameters.setRemoteBranching(
releaseDescriptor.isRemoteTagging() );
scmBranchParameters.setScmRevision(
releaseDescriptor.getScmReleasedPomRevision() );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1625613&r1=1625612&r2=1625613&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
Wed Sep 17 14:36:54 2014
@@ -113,7 +113,7 @@ public class ScmTagPhase
ScmFileSet fileSet = new ScmFileSet( new File(
basedirAlignedReleaseDescriptor.getWorkingDirectory() ) );
String tagName = releaseDescriptor.getScmReleaseLabel();
ScmTagParameters scmTagParameters =
- new ScmTagParameters( releaseDescriptor.getScmCommentPrefix()
+ " copy for tag " + tagName );
+ new ScmTagParameters( releaseDescriptor.getScmCommentPrefix()
+ "copy for tag " + tagName );
scmTagParameters.setRemoteTagging(
releaseDescriptor.isRemoteTagging() );
scmTagParameters.setScmRevision(
releaseDescriptor.getScmReleasedPomRevision() );
if ( getLogger().isDebugEnabled() )
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java?rev=1625613&r1=1625612&r2=1625613&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
Wed Sep 17 14:36:54 2014
@@ -89,7 +89,7 @@ public class ScmBranchPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
getPath(rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -127,7 +127,7 @@ public class ScmBranchPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory( getPath(
rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
descriptor.setScmBranchBase(
"http://svn.example.com/repos/project/branches/"; );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -169,7 +169,7 @@ public class ScmBranchPhaseTest
descriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
descriptor.setWorkingDirectory( getPath(
rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
// one directory up from root project
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile().getParentFile() );
@@ -213,7 +213,7 @@ public class ScmBranchPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory( getPath
(rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -431,4 +431,4 @@ public class ScmBranchPhaseTest
descriptor.setWorkingDirectory( getPath(getTestFile(
"target/test/checkout" ) ) );
return descriptor;
}
-}
\ No newline at end of file
+}
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1625613&r1=1625612&r2=1625613&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Wed Sep 17 14:36:54 2014
@@ -89,7 +89,7 @@ public class ScmTagPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory(
getPath(rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -127,7 +127,7 @@ public class ScmTagPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory( getPath(
rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
descriptor.setScmTagBase(
"http://svn.example.com/repos/project/releases/"; );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -169,7 +169,7 @@ public class ScmTagPhaseTest
descriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
descriptor.setWorkingDirectory( getPath(
rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
// one directory up from root project
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile().getParentFile() );
@@ -213,7 +213,7 @@ public class ScmTagPhaseTest
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects
);
descriptor.setWorkingDirectory( getPath
(rootProject.getFile().getParentFile() ) );
descriptor.setScmReleaseLabel( "release-label" );
- descriptor.setScmCommentPrefix( "[my prefix]" );
+ descriptor.setScmCommentPrefix( "[my prefix] " );
ScmFileSet fileSet = new ScmFileSet(
rootProject.getFile().getParentFile() );
@@ -431,4 +431,4 @@ public class ScmTagPhaseTest
descriptor.setWorkingDirectory( getPath(getTestFile(
"target/test/checkout" ) ) );
return descriptor;
}
-}
\ No newline at end of file
+}
