MRM-424 include 'apache' and the version number in the distribution filenames

How do I get the source distro to unpack to a directory ending in -src?

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@549983 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index de086ef2b998cc0ed5ad4b12d14c1df6ef440556..19c490c2396f3bbcd4963343ac755fd45bd37452 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -139,7 +139,7 @@
         </executions>
         <configuration>
           <descriptor>src/main/assembly/bin.xml</descriptor>
-          <finalName>archiva-${version}</finalName>
+          <finalName>apache-archiva-${version}</finalName>
         </configuration>
       </plugin>
       <plugin>

diff --git a/pom.xml b/pom.xml
index 5b43677de2904305bc2c53c737a19ffe13bedaf3..7e816c46ba9a2c4314d1cf27e9d508b5a2fd8eb7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
             <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
-          <finalName>archiva</finalName>
+          <finalName>apache-archiva-${version}</finalName>
         </configuration>
         <executions>
           <execution>