svn commit: r1806577 - in /axis/axis2/java/core/trunk/modules: distribution/src/main/assembly/bin-assembly.xml tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java

[veithen]

Author: veithen
Date: Tue Aug 29 11:58:07 2017
New Revision: 1806577

URL: http://svn.apache.org/viewvc?rev=1806577&view=rev
Log:
AXIS2-5865: Fix a couple of issues that occur when building only parts of the 
project (and dependencies are pulled from snapshot repositories).

Modified:
    
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
    
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java

Modified: 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1806577&r1=1806576&r2=1806577&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
 Tue Aug 29 11:58:07 2017
@@ -170,6 +170,9 @@
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>lib</outputDirectory>
+            <!-- Use artifact.baseVersion instead of artifact.version to avoid 
inconsistency with
+                 the Web app built by Maven. This only affects snapshot 
builds. -->
+            
<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
                 <include>*:*:jar</include>
             </includes>

Modified: 
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java?rev=1806577&r1=1806576&r2=1806577&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
 Tue Aug 29 11:58:07 2017
@@ -54,7 +54,7 @@ public class ArchiveDeployer {
         StringBuilder buffer = new StringBuilder(artifact.getArtifactId());
         if (!stripVersion) {
             buffer.append("-");
-            buffer.append(artifact.getVersion());
+            buffer.append(artifact.getBaseVersion());
         }
         buffer.append(".");
         buffer.append(artifact.getType());