[MRM-880]

-upgraded appassambler-maven-plugin version to latest snapshot
-include solaris-sparc-32, solaris-sparc-64 and linux-x86-64 bin and lib files in the standalone bundle

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

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 05182dbbd5a4b40cefe6c4a3d4699a1df0e11122..a06152b3d248381ddd5abefc0b2425da834a4662 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -142,7 +142,7 @@
        <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.0-beta-1</version>
+        <version>1.0-SNAPSHOT</version>
         <configuration>
           <daemons>
             <daemon>
@@ -200,6 +200,15 @@
                       <value>30</value>
                     </property>
                   </configuration>
+                  <includes>
+                    <include>linux-x86-32</include>
+                    <include>linux-x86-64</include>
+                    <include>macosx-x86-universal-32</include>
+                    <include>solaris-x86-32</include>
+                    <include>solaris-sparc-32</include>
+                    <include>solaris-sparc-64</include>
+                    <include>windows-x86-32</include>
+                  </includes>
                 </generatorConfiguration>
               </generatorConfigurations>
               <jvmSettings>

diff --git a/archiva-jetty/src/main/assembly/bin.xml b/archiva-jetty/src/main/assembly/bin.xml
index 5b2f675e84226d1744884324414a05d9be4a7523..0e3206dfa03c49dbca95de11a02abe0da95a6aef 100644 (file)
--- a/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-jetty/src/main/assembly/bin.xml
@@ -60,8 +60,11 @@
       <outputDirectory>bin</outputDirectory>
       <includes>   
          <include>wrapper-linux-x86-32</include>
+         <include>wrapper-linux-x86-64</include>
          <include>wrapper-macosx-universal-32</include>
          <include>wrapper-solaris-x86-32</include>
+         <include>wrapper-solaris-sparc-32</include>
+         <include>wrapper-solaris-sparc-64</include>
       </includes>
       <fileMode>0755</fileMode>
     </fileSet>