Author: skygo
Date: Tue Apr 1 00:02:32 2014
New Revision: 1583496
URL: http://svn.apache.org/r1583496
Log:
appassembler-maven-plugin up to 1.7, better x64 selection for deamon
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=1583496&r1=1583495&r2=1583496&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 00:02:32
2014
@@ -98,8 +98,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.7</version>
<configuration>
+ <configurationDirectory>conf</configurationDirectory>
<daemons>
<daemon>
<id>archiva</id>
@@ -163,6 +164,7 @@
<include>solaris-sparc-32</include>
<include>solaris-sparc-64</include>
<include>windows-x86-32</include>
+ <include>windows-x86-64</include>
</includes>
</generatorConfiguration>
</generatorConfigurations>
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=1583496&r1=1583495&r2=1583496&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 00:02:32 2014
@@ -82,6 +82,7 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>wrapper-windows-x86-32.exe</include>
+ <include>wrapper-windows-x86-64.exe</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
