You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/06/25 15:02:01 UTC

svn commit: r1750208 - in /maven/shared/trunk/maven-project-utils/src: main/java/org/apache/maven/shared/project/runtime/MavenUtils.java test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java

Author: hboutemy
Date: Sat Jun 25 15:01:57 2016
New Revision: 1750208

URL: http://svn.apache.org/viewvc?rev=1750208&view=rev
Log:
[MSHARED-562] changed MavenUtils.compareToVersion(version) order: compare current with version (and not the opposite)

Modified:
    maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
    maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java

Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java?rev=1750208&r1=1750207&r2=1750208&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java Sat Jun 25 15:01:57 2016
@@ -64,8 +64,9 @@ public final class MavenUtils
     }
 
     /**
-     * Returns a positive value if the version parameter is bigger compared to the runtime Maven version
-     * Returns a negative value if the version parameter is less compared to the runtime Maven version
+     * Compares the runtime Maven version to the version parameter.
+     * Returns a positive value if the runtime Maven version is bigger than the version parameter. 
+     * Returns a negative value if the runtime Maven version is less than the version parameter. 
      * Returns 0 if they are the same.
      * 
      * @param version the version to compare
@@ -73,6 +74,6 @@ public final class MavenUtils
      */
     public static int compareToVersion( String version )
     {
-        return new DefaultArtifactVersion( version ).compareTo( new DefaultArtifactVersion( getMavenVersion() ) );
+        return new DefaultArtifactVersion( getMavenVersion() ).compareTo( new DefaultArtifactVersion( version ) );
     }
 }

Modified: maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java?rev=1750208&r1=1750207&r2=1750208&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java (original)
+++ maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java Sat Jun 25 15:01:57 2016
@@ -29,8 +29,8 @@ public class MavenUtilsTest
     @Test
     public void testCompareToVersion()
     {
-        assertTrue( MavenUtils.compareToVersion( "101.0.0" ) > 0 );
+        assertTrue( MavenUtils.compareToVersion( "101.0.0" ) < 0 );
         assertTrue( MavenUtils.compareToVersion( MavenUtils.getMavenVersion() ) == 0 );
-        assertTrue( MavenUtils.compareToVersion( "0.0.1" ) < 0 );
+        assertTrue( MavenUtils.compareToVersion( "0.0.1" ) > 0 );
     }
 }