[MRELEASE-1064] [REGRESSION] release:branch uses @releaseLabel instead of @branchName in default SCM commit

[jira-importer]

Jordan Amar opened MRELEASE-1064 and commented

Calling plugin with this command: 

mvn release:branch -B -DbranchName=lol -DupdateBranchVersions=true -DdryRun

 (dry run or not) will create a commit with the folling comment:

[maven-release-plugin] prepare branch @{releaseLabel}

+branchName+ should be used instead +releaseLabel+ in scmBranchCommitComment

---

Affects: 3.0.0-M4

Issue Links:

• MRELEASE-1138 [REGRESSION] @{releaseLabel} variable is not resolved in the commit message of the branch goal
  ("is duplicated by")

Remote Links:

• GitHub Pull Request #221
  

1 votes, 5 watchers

[jira-importer]

Michael Osipov commented

Interesting...will have a look at next week.

[jira-importer]

Alexey Ivanov commented

It seems it is better to fix code. It will be more clear to use.

maven-release/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java

Line 224 in 8142302

if ( branch )

I believe should be

comment = comment.replace( "@{prefix}", releaseDescriptor.getScmCommentPrefix().trim() );
comment = comment.replace( "@{groupId}", project.getGroupId() );
comment = comment.replace( "@{artifactId}", project.getArtifactId() );
comment = comment.replace( "@{branchName}", releaseDescriptor.getScmReleaseLabel() ); // maybe it is better to add getScmBranchName() here? 
comment = comment.replace( "@{releaseLabel}", releaseDescriptor.getScmReleaseLabel() );

 

[jira-importer]

Michael Osipov commented

The next week turned out to be three years...

[jira-importer]

Michael Osipov commented

Fixed with f3bbb7769da79cce175cf1e9b47a617e56195753.