aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-jetty/pom.xml1
-rw-r--r--archiva-jetty/src/main/assembly/bin.xml1
-rw-r--r--pom.xml2
3 files changed, 3 insertions, 1 deletions
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>
diff --git a/pom.xml b/pom.xml
index 1634899dd..d7101f894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>