[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/

[Miroslav Šulc]

commit:     a1b98fecda5e9d9c832b73305fb47edc604dd06d
Author:     zongyu <zzy2529420793 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 19 05:37:34 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 09:48:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=a1b98fec

MavenVersion.class enhancement:

make MavenVersion.class able to compare incremental version
make it convert qualifier to lowercase to avoid the situation when
  maintainer mixes uppercase and lowercase

Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com>

 src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java 
b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
index 71da8a6..42cd9cd 100644
--- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
@@ -70,7 +70,7 @@ public class MavenVersion implements Comparable<MavenVersion> 
{
                 ? 0 : Integer.parseInt(matcher.group(2), 10);
         incrementalVersion = matcher.group(3) == null
                 ? 0 : Integer.parseInt(matcher.group(3), 10);
-        qualifier = matcher.group(4) == null ? "" : matcher.group(4);
+        qualifier = matcher.group(4) == null ? "" : 
matcher.group(4).toLowerCase();
     }
 
     @Override
@@ -81,6 +81,8 @@ public class MavenVersion implements Comparable<MavenVersion> 
{
             return 
Integer.valueOf(majorVersion).compareTo(o.getMajorVersion());
         } else if (minorVersion != o.getMinorVersion()) {
             return 
Integer.valueOf(minorVersion).compareTo(o.getMinorVersion());
+        } else if (incrementalVersion != o.getIncrementalVersion()) {
+            return 
Integer.valueOf(incrementalVersion).compareTo(o.getIncrementalVersion());
         } else {
             return qualifier.compareTo(o.getQualifier());
         }