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

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


The following commit(s) were added to refs/heads/master by this push:
     new 867fe349a6 ComparableVersion#getCanonical(): restore separator between 
qualifier and number (#13890)
867fe349a6 is described below

commit 867fe349a690d7e9a09bf1e90c2a043f8dd6dc77
Author: Jay <[email protected]>
AuthorDate: Tue Nov 10 10:04:37 2026 -0500

    ComparableVersion#getCanonical(): restore separator between qualifier and 
number (#13890)
    
    * Keep the separator between a qualifier and its number in ComparableVersi
    
    * Address review feedback
    
    ---------
    
    Co-authored-by: jay23606 <[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 091806b9a2..3065da3890 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 7d7d046b8d..7652b8e3c6 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
@@ -721,4 +721,17 @@ void testHyphenatedZeroCanonical() {
         checkVersionsEqual("1-0-1-0", "1-0-1");
         assertEquals("1-0-1", newComparable("1-0-1-0").getCanonical());
     }
+
+    /**
+     * 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