You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/07 20:15:41 UTC
svn commit: r1585541 - /archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml
Author: skygo
Date: Mon Apr 7 18:15:41 2014
New Revision: 1585541
URL: http://svn.apache.org/r1585541
Log:
ensure ARCHIVA_BASE works in 1.3.x branches see http://svn.apache.org/r1563760
updated antrun plugin to make it works
Modified:
archiva/branches/archiva-1.3.x/archiva-jetty/pom.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=1585541&r1=1585540&r2=1585541&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-jetty/pom.xml Mon Apr 7 18:15:41 2014
@@ -191,6 +191,7 @@
<goal>generate-daemons</goal>
<goal>create-repository</goal>
</goals>
+ <phase>prepare-package</phase>
</execution>
</executions>
</plugin>
@@ -212,7 +213,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.7</version>
<executions>
<execution>
<id>config</id>
@@ -229,6 +230,18 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>fix-appassembler-bug</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <replaceregexp file="target/generated-resources/appassembler/jsw/archiva/conf/wrapper.conf" match="set.ARCHIVA_BASE" replace="set.default.ARCHIVA_BASE" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>