svn commit: r900167 - in /maven/mercury/trunk/mercury-core/src: main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java

[hboutemy]

Author: hboutemy
Date: Sun Jan 17 17:46:04 2010
New Revision: 900167

URL: http://svn.apache.org/viewvc?rev=900167&view=rev
Log:
[MERCURY-134] 1.0-beta-3 should be < 1.0-SNAPSHOT (merged from maven-artifact 
r900164)

Modified:
    
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java
    
maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java

Modified: 
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java?rev=900167&r1=900166&r2=900167&view=diff
==============================================================================
--- 
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java
 (original)
+++ 
maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/artifact/version/ComparableVersion.java
 Sun Jan 17 17:46:04 2010
@@ -123,7 +123,7 @@
     private static class StringItem
         implements Item
     {
-        private final static String[] QUALIFIERS = { "snapshot", "alpha", 
"beta", "milestone", "rc", "", "sp" };
+        private final static String[] QUALIFIERS = { "alpha", "beta", 
"milestone", "rc", "snapshot", "", "sp" };
 
         private final static List _QUALIFIERS = Arrays.asList( QUALIFIERS );
 
@@ -180,7 +180,7 @@
          * requires a lot of if/then/else to check for -1 or QUALIFIERS.size 
and then resort to lexical ordering. Most
          * comparisons are decided by the first character, so this is still 
fast. If more characters are needed then it
          * requires a lexical sort anyway.
-         * 
+         *
          * @param qualifier
          * @return
          */

Modified: 
maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java?rev=900167&r1=900166&r2=900167&view=diff
==============================================================================
--- 
maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
 (original)
+++ 
maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
 Sun Jan 17 17:46:04 2010
@@ -25,7 +25,7 @@
 
 /**
  * Test ComparableVersion.
- * 
+ *
  * @author <a href="mailto:hbout...@apache.org";>Herve Boutemy</a>
  * @version $Id$
  */
@@ -38,8 +38,8 @@
     }
 
     private static final String[] VERSIONS_QUALIFIER =
-        { "1-SNAPSHOT", "1-alpha2snapshot", "1-alpha2", "1-alpha-123", 
"1-beta-2", "1-beta123", "1-m2", "1-m11",
-            "1-rc", "1-cr2", "1-rc123", "1", "1-sp", "1-sp2", "1-sp123", 
"1-abc", "1-def", "1-pom-1", "1-1-snapshot",
+        { "1-alpha2snapshot", "1-alpha2", "1-alpha-123", "1-beta-2", 
"1-beta123", "1-m2", "1-m11", "1-rc", "1-cr2",
+            "1-rc123", "1-SNAPSHOT", "1", "1-sp", "1-sp2", "1-sp123", "1-abc", 
"1-def", "1-pom-1", "1-1-snapshot",
             "1-1", "1-2", "1-123" };
 
     private static final String[] VERSIONS_NUMBER =
@@ -137,7 +137,7 @@
         checkVersionsOrder( "1.0-alpha-1", "1.0-alpha-2" );
         checkVersionsOrder( "1.0-alpha-1", "1.0-beta-1" );
 
-        checkVersionsOrder( "1.0-SNAPSHOT", "1.0-beta-1" );
+        checkVersionsOrder( "1.0-beta-1", "1.0-SNAPSHOT" );
         checkVersionsOrder( "1.0-SNAPSHOT", "1.0" );
         checkVersionsOrder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );