svn commit: r1747973 - in /maven/shared/trunk/maven-project-utils/src: main/java/org/apache/maven/shared/project/runtime/ main/java/org/apache/maven/shared/project/utils/ test/java/org/apache/maven/shared/project/runtime/

[rf...@apache.org]

Author: rfscholte
Date: Sun Jun 12 10:15:49 2016
New Revision: 1747973

URL: http://svn.apache.org/viewvc?rev=1747973&view=rev
Log:
Replace float comparision with String comparison, otherwise the floats 4.1.x and 4.10.x are considered the same version

Added:
    maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/
    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
    maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.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=1747973&r1=1747972&r2=1747973&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 Sun Jun 12 10:15:49 2016
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.IOUtil;
 
@@ -63,13 +64,15 @@ public final class MavenUtils
     }
 
     /**
-     * Get Maven version as major.minor float
+     * 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
+     * Returns 0 if they are the same.
      * 
-     * @return
+     * @param version the version to compare
+     * @return 
      */
-    public static float getMavenVersionAsFloat()
+    public static int compareToVersion( String version )
     {
-        String[] digits = getMavenVersion().split( "\\." );
-        return Float.parseFloat( digits[0] + '.' + digits[1] );
+        return new DefaultArtifactVersion( version ).compareTo( new DefaultArtifactVersion( getMavenVersion() ) );
     }
 }

Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java?rev=1747973&r1=1747972&r2=1747973&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java Sun Jun 12 10:15:49 2016
@@ -28,7 +28,7 @@ import org.fusesource.jansi.AnsiConsole;
  */
 public class AnsiUtils
 {
-    private static final float MINIMUM_MAVEN_VERSION = 3.4f; // color added in Maven 3.4.0: see MNG-3507
+    private static final String MINIMUM_MAVEN_VERSION = "3.4.0"; // color added in Maven 3.4.0: see MNG-3507
 
     private AnsiUtils()
     {
@@ -37,7 +37,7 @@ public class AnsiUtils
     public static void systemInstall()
     {
         AnsiConsole.systemInstall();
-        if ( MavenUtils.getMavenVersionAsFloat() < MINIMUM_MAVEN_VERSION )
+        if ( MavenUtils.compareToVersion( MINIMUM_MAVEN_VERSION ) >= 0 )
         {
             // ANSI color support was added in Maven 3.4.0: don't enable color if executing older Maven versions
             Ansi.setEnabled( false );

Added: 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=1747973&view=auto
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java (added)
+++ maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/runtime/MavenUtilsTest.java Sun Jun 12 10:15:49 2016
@@ -0,0 +1,36 @@
+package org.apache.maven.shared.project.runtime;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class MavenUtilsTest
+{
+
+    @Test
+    public void testCompareToVersion()
+    {
+        assertTrue( MavenUtils.compareToVersion( "101.0.0" ) > 0 );
+        assertTrue( MavenUtils.compareToVersion( MavenUtils.getMavenVersion() ) == 0 );
+        assertTrue( MavenUtils.compareToVersion( "0.0.1" ) < 0 );
+    }
+}