svn commit: r1481559 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java

[hboutemy]

Author: hboutemy
Date: Sun May 12 14:01:17 2013
New Revision: 1481559

URL: http://svn.apache.org/r1481559
Log:
[MDEP-379] use the normal artifactId-version-classifier scheme instead of 
actual artifactId-classifier-version-type

Modified:
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
    
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?rev=1481559&r1=1481558&r2=1481559&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
 Sun May 12 14:01:17 2013
@@ -206,30 +206,27 @@ public final class DependencyUtil
 
         sb.append( artifact.getArtifactId() );
 
+        if ( !removeVersion )
+        {
+            sb.append( "-" );
+            sb.append( artifact.getVersion() );
+        }
+
         if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
         {
             sb.append( "-" );
             sb.append( artifact.getClassifier() );
         }
 
-        if ( !removeVersion )
+        // if the classifier and type are the same (sources), then don't
+        // repeat.
+        // avoids names like foo-sources-sources
+        if ( !StringUtils.equals( artifact.getClassifier(), artifact.getType() 
) )
         {
             sb.append( "-" );
-            sb.append( artifact.getVersion() );
-            sb.append( "-" );
             sb.append( artifact.getType() );
         }
-        else
-        {
-            // if the classifier and type are the same (sources), then don't
-            // repeat.
-            // avoids names like foo-sources-sources
-            if ( !StringUtils.equals( artifact.getClassifier(), 
artifact.getType() ) )
-            {
-                sb.append( "-" );
-                sb.append( artifact.getType() );
-            }
-        }
+
         return sb.toString();
     }
 

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java?rev=1481559&r1=1481558&r2=1481559&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
 Sun May 12 14:01:17 2013
@@ -118,7 +118,7 @@ public class TestDependencyUtil
         assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() ) 
);
 
         name = DependencyUtil.getFormattedOutputDirectory( false, false, true, 
false, false, folder, artifact );
-        expectedResult = folder.getAbsolutePath() + File.separatorChar + 
"one-sources-1.1-jar";
+        expectedResult = folder.getAbsolutePath() + File.separatorChar + 
"one-1.1-sources-jar";
         assertEquals( expectedResult, name.getAbsolutePath() );
 
         name = DependencyUtil.getFormattedOutputDirectory( false, false, true, 
false, true, folder, artifact );
@@ -127,7 +127,7 @@ public class TestDependencyUtil
 
         name = DependencyUtil.getFormattedOutputDirectory( false, true, true, 
false, false, folder, artifact );
         expectedResult = folder.getAbsolutePath() + File.separatorChar + 
"jars" + File.separatorChar
-            + "one-sources-1.1-jar";
+            + "one-1.1-sources-jar";
         assertEquals( expectedResult, name.getAbsolutePath() );
 
         name = DependencyUtil.getFormattedOutputDirectory( false, true, true, 
false, true, folder, artifact );
@@ -186,7 +186,7 @@ public class TestDependencyUtil
         assertEquals( expectedResult, name.getAbsolutePath() );
 
         name = DependencyUtil.getFormattedOutputDirectory( false, false, true, 
false, false, folder, sources );
-        expectedResult = folder.getAbsolutePath() + File.separatorChar + 
"two-sources-1.1-SNAPSHOT-sources";
+        expectedResult = folder.getAbsolutePath() + File.separatorChar + 
"two-1.1-SNAPSHOT-sources";
         assertEquals( expectedResult, name.getAbsolutePath() );
     }