You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/02/08 13:04:47 UTC
svn commit: r1566000 - /archiva/trunk/archiva-jetty/pom.xml
Author: olamy
Date: Sat Feb 8 12:04:47 2014
New Revision: 1566000
URL: http://svn.apache.org/r1566000
Log:
ensure ARCHIVA_BASE works
Previous workaround failed due to the ordering of wrapper.conf, so now we
leave the current mechanism in place, but workaround the APPASM bug by
replacing set.ARCHIVA_BASE=. with set.default.ARCHIVA_BASE=.
Modified:
archiva/trunk/archiva-jetty/pom.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1566000&r1=1565999&r2=1566000&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Sat Feb 8 12:04:47 2014
@@ -196,27 +196,12 @@
<goal>generate-daemons</goal>
<goal>create-repository</goal>
</goals>
+ <phase>prepare-package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <finalName>apache-archiva-${project.version}</finalName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -235,6 +220,20 @@
<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>
@@ -245,6 +244,22 @@
</supplementalModels>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <finalName>apache-archiva-${project.version}</finalName>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>