[
https://issues.apache.org/jira/browse/MRELEASE-1109?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17852130#comment-17852130
]
ASF GitHub Bot commented on MRELEASE-1109:
------------------------------------------
michael-o commented on code in PR #202:
URL: https://github.com/apache/maven-release/pull/202#discussion_r1626373410
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java:
##########
@@ -192,14 +199,13 @@ public void setVersion(String version) {
project.addContent(index + 2, versionElement);
}
} else {
- if
(AbstractRewritePomsPhase.isCiFriendlyVersion(versionElement.getTextNormalize()))
{
+ if
(CiFriendlyVersion.isCiFriendlyVersion(versionElement.getTextNormalize())) {
// try to rewrite property if CI friendly expression is used
- String ciFriendlyPropertyName =
-
AbstractRewritePomsPhase.extractPropertyFromExpression(versionElement.getTextNormalize());
- Properties properties = getProperties();
- if (properties != null) {
- properties.setProperty(ciFriendlyPropertyName, version);
- }
+ CiFriendlyVersion.rewriteVersionAndProperties(
+ version,
+ versionElement.getTextNormalize(),
+ (JDomProperties) getProperties(),
+ mavenProject.getProperties());
Review Comment:
@cstamas @slawekjaranowski @gnodet Do you guys know from the top of your
heads whether this contains merged props (model + user) or model only?
> 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)
