diff options
| author | skygo <skygo@unknown> | 2014-04-01 22:30:57 +0000 |
|---|---|---|
| committer | skygo <skygo@unknown> | 2014-04-01 22:30:57 +0000 |
| commit | f223128de728bb2b58924ea73e20975f4a0cb22a (patch) | |
| tree | dde17689272cb68dd6e7b9ea778bd2b8f925701c | |
| parent | 638f9baba802e1d83e445a974b063bf505890b2e (diff) | |
| download | archiva-f223128de728bb2b58924ea73e20975f4a0cb22a.tar.gz archiva-f223128de728bb2b58924ea73e20975f4a0cb22a.zip | |
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
| -rw-r--r-- | archiva-jetty/pom.xml | 1 | ||||
| -rw-r--r-- | archiva-jetty/src/main/assembly/bin.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 2 |
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> @@ -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> |