ensure ARCHIVA_BASE works in 1.3.x branches see http://svn.apache.org/r1563760

 updated antrun plugin to make it works

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1585541 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index aa2c1524c9cfaee903b1d83676d48ee81ddbb558..166749c32a928b98fd76f0e3aad2445fabe40d6e 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -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>