[ 
https://issues.apache.org/jira/browse/MRELEASE-1109?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17851672#comment-17851672
 ] 

ASF GitHub Bot commented on MRELEASE-1109:
------------------------------------------

mkolesnikov commented on code in PR #202:
URL: https://github.com/apache/maven-release/pull/202#discussion_r1624586351


##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java:
##########
@@ -198,7 +199,17 @@ public void setVersion(String version) {
                         
AbstractRewritePomsPhase.extractPropertyFromExpression(versionElement.getTextNormalize());
                 Properties properties = getProperties();
                 if (properties != null) {
-                    properties.computeIfPresent(ciFriendlyPropertyName, (k, v) 
-> version);
+                    String sha1 = properties.getProperty("sha1", "");
+                    String changelist = properties.getProperty("changelist", 
"");
+                    properties.setProperty(
+                            ciFriendlyPropertyName,
+                            // assume that everybody follows the example and 
properties are simply chained
+                            version.replaceAll(sha1, 
"").replaceAll(changelist, ""));

Review Comment:
   Addressed





> update-versions removes the CI-friendly ${revisions}
> ----------------------------------------------------
>
>                 Key: MRELEASE-1109
>                 URL: https://issues.apache.org/jira/browse/MRELEASE-1109
>             Project: Maven Release Plugin
>          Issue Type: Bug
>          Components: prepare, update-versions
>    Affects Versions: 2.5.3, 3.0.0-M7
>            Reporter: Marcel Stör
>            Assignee: Konrad Windszus
>            Priority: Major
>             Fix For: next-release
>
>
> Given: a project using CI-friendly versions as per 
> [https://maven.apache.org/maven-ci-friendly.html]
> {code:xml}
>   <version>${revision}</version>
>   ...
>   <properties>
>     <revision>1.0.0-SNAPSHOT</revision>
>   </properties>
> {code}
> If I run {{mvn release:update-versions}} (with or without 
> {{{}-DautoVersionSubmodules=true{}}}) I expect the release plugin to change 
> the {{$revision}} property. Instead it blindly replaces 
> {{<version>${revision}</version>}} with the hard-coded version set on the CLI.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

Reply via email to