You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/02 01:42:36 UTC

svn commit: r1583831 - in /archiva/branches/archiva-1.3.x/archiva-jetty: pom.xml src/main/assembly/bin.xml

Author: skygo
Date: Tue Apr  1 23:42:35 2014
New Revision: 1583831

URL: http://svn.apache.org/r1583831
Log:
fix wrappers for macos 32/64 arch on 1.3.x

Modified:
    archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml
    archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml

Modified: archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml?rev=1583831&r1=1583830&r2=1583831&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml Tue Apr  1 23:42:35 2014
@@ -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>

Modified: archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml?rev=1583831&r1=1583830&r2=1583831&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-jetty/src/main/assembly/bin.xml Tue Apr  1 23:42:35 2014
@@ -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>