[MRELEASE-1153] Revert parts of MRELEASE-1109 (8dfcb47) due to a regr…

…ession This reverts commit 8dfcb47. This closes #224
apache · Jul 11, 2024 · 06f6de4 · 06f6de4
1 parent 985d0bc
commit 06f6de4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/...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 @@ private void rewriteVersion(
      */
     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/...ease-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java b/...ease-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
@@ -198,7 +198,7 @@ public void setVersion(String version) {
                         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/.../projects/rewrite-for-release/pom-with-parent-and-cifriendly-expressions/expected-pom.xml b/.../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>