From f223128de728bb2b58924ea73e20975f4a0cb22a Mon Sep 17 00:00:00 2001
From: skygo <skygo@unknown>
Date: Tue, 1 Apr 2014 22:30:57 +0000
Subject: appassembler-maven-plugin up to 1.7, better x64 selection for deamon
 for 2.0.x

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1583810 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-jetty/pom.xml                   | 1 +
 archiva-jetty/src/main/assembly/bin.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'archiva-jetty')

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 6000f538e..b13342f70 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -98,6 +98,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
         <configuration>
+          <configurationDirectory>conf</configurationDirectory>
           <daemons>
             <daemon>
               <id>archiva</id>
diff --git a/archiva-jetty/src/main/assembly/bin.xml b/archiva-jetty/src/main/assembly/bin.xml
index 23fe710f2..06cefc8ae 100644
--- a/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-jetty/src/main/assembly/bin.xml
@@ -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>
-- 
cgit v1.2.3