You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/07/11 17:44:40 UTC
(maven-release) branch MRELEASE-1153 created (now 237b0f55)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRELEASE-1153
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at 237b0f55 [MRELEASE-1153] Revert MRELEASE-1109 (8dfcb47996320af5e6f0b2d50eac209eeb4c29ce) due to a regression
This branch includes the following new commits:
new 237b0f55 [MRELEASE-1153] Revert MRELEASE-1109 (8dfcb47996320af5e6f0b2d50eac209eeb4c29ce) due to a regression
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-release) 01/01: [MRELEASE-1153] Revert MRELEASE-1109 (8dfcb47996320af5e6f0b2d50eac209eeb4c29ce) due to a regression
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1153
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 237b0f554991da9eafd770e8d89f75e4b0e7d056
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 11 19:43:40 2024 +0200
[MRELEASE-1153] Revert MRELEASE-1109 (8dfcb47996320af5e6f0b2d50eac209eeb4c29ce) due to a regression
This reverts commit 8dfcb47996320af5e6f0b2d50eac209eeb4c29ce.
This closes #224
---
.../apache/maven/shared/release/phase/AbstractRewritePomsPhase.java | 4 ++--
.../org/apache/maven/shared/release/transform/jdom2/JDomModel.java | 2 +-
.../pom-with-parent-and-cifriendly-expressions/expected-pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 71972df1..76747c56 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -96,7 +96,7 @@ public abstract class AbstractRewritePomsPhase extends AbstractReleasePhase impl
* Regular expression pattern matching Maven expressions (i.e. references to Maven properties).
* The first group selects the property name the expression refers to.
*/
- private static final Pattern EXPRESSION_PATTERN = Pattern.compile("\\$\\{(.+?)\\}");
+ private static final Pattern EXPRESSION_PATTERN = Pattern.compile("\\$\\{(.+)\\}");
/**
* All Maven properties allowed to be referenced in parent versions via expressions
@@ -462,7 +462,7 @@ public abstract class AbstractRewritePomsPhase extends AbstractReleasePhase impl
*/
public static String extractPropertyFromExpression(String expression) {
Matcher matcher = EXPRESSION_PATTERN.matcher(expression);
- if (!matcher.find()) {
+ if (!matcher.matches()) {
return null;
}
return matcher.group(1);
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
index 20d972bd..6198ee73 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
@@ -198,7 +198,7 @@ public class JDomModel extends Model {
AbstractRewritePomsPhase.extractPropertyFromExpression(versionElement.getTextNormalize());
Properties properties = getProperties();
if (properties != null) {
- properties.setProperty(ciFriendlyPropertyName, version);
+ properties.computeIfPresent(ciFriendlyPropertyName, (k, v) -> version);
}
} else {
JDomUtils.rewriteValue(versionElement, version);
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
index b4326d54..c7504063 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml
@@ -30,7 +30,7 @@
</scm>
<properties>
- <revision>1.0</revision>
+ <revision>1.0-SNAPSHOT</revision>
</properties>
<modules>