fix wrappers for macos 32/64 arch on 1.3.x

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1583831 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 1c3fff3cff3421e5034278b59124f3ad249ef987..aa2c1524c9cfaee903b1d83676d48ee81ddbb558 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -100,7 +100,7 @@
         <artifactId>appassembler-maven-plugin</artifactId>
         <version>1.7</version>
         <configuration>
-          <configurationDirectory>conf</configurationDirectory>  
+          <configurationDirectory>conf</configurationDirectory>
           <daemons>
             <daemon>
               <id>archiva</id>
@@ -159,7 +159,8 @@
                   <includes>
                     <include>linux-x86-32</include>
                     <include>linux-x86-64</include>
-                    <include>macosx-x86-universal-32</include>
+                    <include>macosx-universal-32</include>
+                    <include>macosx-universal-64</include>
                     <include>solaris-x86-32</include>
                     <include>solaris-sparc-32</include>
                     <include>solaris-sparc-64</include>

diff --git a/archiva-jetty/src/main/assembly/bin.xml b/archiva-jetty/src/main/assembly/bin.xml
index bdf8b7c7e7f11333885043fa81182a8c5671df8d..19e679df5b75824fe2ac289c23669caed893f42f 100644 (file)
--- a/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-jetty/src/main/assembly/bin.xml
@@ -62,6 +62,7 @@
          <include>wrapper-linux-x86-32</include>
          <include>wrapper-linux-x86-64</include>
          <include>wrapper-macosx-universal-32</include>
+         <include>wrapper-macosx-universal-64</include>
          <include>wrapper-solaris-x86-32</include>
          <include>wrapper-solaris-sparc-32</include>
          <include>wrapper-solaris-sparc-64</include>