This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-4.0.x by this push:
     new 96a12a733f ComparableVersion#getCanonical(): restore separator between 
qualifier and number (#13898)
96a12a733f is described below

commit 96a12a733fa05e0255994915712f1b83bda68914
Author: Jay <[email protected]>
AuthorDate: Tue Nov 10 10:05:00 2026 -0500

    ComparableVersion#getCanonical(): restore separator between qualifier and 
number (#13898)
    
    Backport of #13890 to maven-4.0.x. CombinationItem.toString() concatenated 
the string and digit parts without the separator, so 3-milestone-2 
canonicalised to 3-milestone2.
    
    Signed-off-by: jay23606 <[email protected]>
    Co-authored-by: Claude Haiku 5.5 <[email protected]>
---
 .../apache/maven/artifact/versioning/ComparableVersion.java |  2 +-
 .../maven/artifact/versioning/ComparableVersionTest.java    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
 
b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index c9abb42f55..6fbd5a24e3 100644
--- 
a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -541,7 +541,7 @@ public int hashCode() {
 
         @Override
         public String toString() {
-            return stringPart.toString() + digitPart.toString();
+            return stringPart.toString() + "-" + digitPart.toString();
         }
     }
 
diff --git 
a/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
 
b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 6341bf2494..ed1f894f5a 100644
--- 
a/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ 
b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -686,4 +686,17 @@ public void testMng7714() {
         assertTrue(f.compareTo(sp2) < 0, "expected " + f + " < " + sp2);
         assertTrue(f.compareTo(sp3) < 0, "expected " + f + " < " + sp3);
     }
+
+    /**
+     * Regression test for <a 
href="https://github.com/apache/maven/issues/13889";>#13889</a> /
+     * <a href="https://issues.apache.org/jira/browse/MNG-7714";>MNG-7714</a>:
+     * a qualifier followed by a number must keep the separator in the 
canonical form, as Maven 3 does.
+     */
+    @Test
+    void testQualifierWithNumberCanonicalSpelling() {
+        assertEquals("3-milestone-2", new 
ComparableVersion("3.0.0-M2").getCanonical());
+        assertEquals("4-beta-1", new 
ComparableVersion("4.0.0-beta-1").getCanonical());
+        assertEquals("3.34-rc-1", new 
ComparableVersion("3.34.0.CR1").getCanonical());
+        assertEquals("1-sp-1", new 
ComparableVersion("1.0-sp1").getCanonical());
+    }
 }

Reply via email to