aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-policies
diff options
context:
space:
mode:
authorJames William Dumay <jdumay@apache.org>2009-02-10 23:54:32 +0000
committerJames William Dumay <jdumay@apache.org>2009-02-10 23:54:32 +0000
commite2dda2e977c423ad34240210557f2cd4ea6b18e0 (patch)
treed020a5c92946319b38052d626be4b3675d8f4909 /archiva-modules/archiva-base/archiva-policies
parent034f98a5096de1a9899a11e3850bafa4d1a0166a (diff)
downloadarchiva-e2dda2e977c423ad34240210557f2cd4ea6b18e0.tar.gz
archiva-e2dda2e977c423ad34240210557f2cd4ea6b18e0.zip
Rolling back MRM-995 as it seemed to have broken lots of things
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-policies')
-rw-r--r--archiva-modules/archiva-base/archiva-policies/pom.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 615272d59..7489f08bc 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -58,12 +58,11 @@
<executions>
<execution>
<id>merge</id>
- <phase>generate-resources</phase>
<goals>
<goal>merge-descriptors</goal>
</goals>
<configuration>
- <output>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</output>
+ <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
<descriptors>
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
<descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>