Author: skygo
Date: Tue Apr 1 22:30:57 2014
New Revision: 1583810
URL: http://svn.apache.org/r1583810
Log:
appassembler-maven-plugin up to 1.7, better x64 selection for deamon for 2.0.x
Modified:
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-jetty/src/main/assembly/bin.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1583810&r1=1583809&r2=1583810&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Tue Apr 1 22:30:57 2014
@@ -98,6 +98,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<configuration>
+ <configurationDirectory>conf</configurationDirectory>
<daemons>
<daemon>
<id>archiva</id>
Modified: archiva/trunk/archiva-jetty/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/assembly/bin.xml?rev=1583810&r1=1583809&r2=1583810&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/assembly/bin.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/assembly/bin.xml Tue Apr 1 22:30:57
2014
@@ -87,6 +87,7 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>wrapper-windows-x86-32.exe</include>
+ <include>wrapper-windows-x86-64.exe</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1583810&r1=1583809&r2=1583810&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Apr 1 22:30:57 2014
@@ -1758,7 +1758,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.3</version>
+ <version>1.7</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
