You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/06/30 15:15:42 UTC

svn commit: r1498114 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/AbstractWarMojo.java test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java

Author: olamy
Date: Sun Jun 30 13:15:41 2013
New Revision: 1498114

URL: http://svn.apache.org/r1498114
Log:
[MWAR-296] maven-war-plugin can cause multiple dependent lib files with same snapshot version.
Submitted by Hayarobi Park.

Modified:
    maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
    maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java

Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1498114&r1=1498113&r2=1498114&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun Jun 30 13:15:41 2013
@@ -66,10 +66,10 @@ import java.util.List;
 public abstract class AbstractWarMojo
     extends AbstractMojo
 {
-    public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{version}@.@{extension}@";
+    public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{baseVersion}@.@{extension}@";
 
     public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
-        "@{artifactId}@-@{version}@-@{classifier}@.@{extension}@";
+        "@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
 
     private static final String[] EMPTY_STRING_ARRAY = {};
 

Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java?rev=1498114&r1=1498113&r2=1498114&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java Sun Jun 30 13:15:41 2013
@@ -40,6 +40,12 @@ public abstract class AbstractArtifactSt
         return "0.0-Test";
     }
 
+    @Override
+    public String getBaseVersion()
+    {
+        return getVersion();
+    }
+
     public String getScope()
     {
         return Artifact.SCOPE_RUNTIME;