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 2019/05/12 15:32:36 UTC
[maven] branch MNG-6655 created (now bd868bf)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6655
in repository https://gitbox.apache.org/repos/asf/maven.git.
at bd868bf [MNG-6655] Add support for "release" qualifier
This branch includes the following new commits:
new bd868bf [MNG-6655] Add support for "release" qualifier
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] 01/01: [MNG-6655] Add support for "release" qualifier
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6655
in repository https://gitbox.apache.org/repos/asf/maven.git
commit bd868bfa58f83efdab16d22f56f3a4ad6c3b08b5
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 12 17:31:35 2019 +0200
[MNG-6655] Add support for "release" qualifier
This closes #248
---
.../apache/maven/artifact/versioning/ComparableVersion.java | 3 ++-
.../maven/artifact/versioning/ComparableVersionTest.java | 12 ++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 64e07cd..d860809 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -33,7 +33,7 @@ import java.util.Properties;
* <p>
* Generic implementation of version comparison.
* </p>
- *
+ *
* Features:
* <ul>
* <li>mixing of '<code>-</code>' (hyphen) and '<code>.</code>' (dot) separators,</li>
@@ -361,6 +361,7 @@ public class ComparableVersion
{
ALIASES.put( "ga", "" );
ALIASES.put( "final", "" );
+ ALIASES.put("release", "");
ALIASES.put( "cr", "rc" );
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index ce7df2d..70fc1d8 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -135,6 +135,7 @@ public class ComparableVersionTest
// aliases
checkVersionsEqual( "1ga", "1" );
+ checkVersionsEqual( "1release", "1" );
checkVersionsEqual( "1final", "1" );
checkVersionsEqual( "1cr", "1rc" );
@@ -150,6 +151,9 @@ public class ComparableVersionTest
checkVersionsEqual( "1M", "1m" );
checkVersionsEqual( "1Ga", "1" );
checkVersionsEqual( "1GA", "1" );
+ checkVersionsEqual( "1RELEASE", "1" );
+ checkVersionsEqual( "1release", "1" );
+ checkVersionsEqual( "1RELeaSE", "1" );
checkVersionsEqual( "1Final", "1" );
checkVersionsEqual( "1FinaL", "1" );
checkVersionsEqual( "1FINAL", "1" );
@@ -229,7 +233,7 @@ public class ComparableVersionTest
/**
* Test all versions are equal when starting with many leading zeroes regardless of string length
- * (related to MNG-6572 optimization)
+ * (related to MNG-6572 optimization)
*/
public void testVersionEqualWithLeadingZeroes()
{
@@ -255,13 +259,13 @@ public class ComparableVersionTest
"01",
"1"
};
-
+
checkVersionsArrayEqual( arr );
}
/**
* Test all "0" versions are equal when starting with many leading zeroes regardless of string length
- * (related to MNG-6572 optimization)
+ * (related to MNG-6572 optimization)
*/
public void testVersionZeroEqualWithLeadingZeroes()
{
@@ -287,7 +291,7 @@ public class ComparableVersionTest
"00",
"0"
};
-
+
checkVersionsArrayEqual( arr );
}