From: Joakim Erdfelt <joakime@apache.org>
Date: Tue, 20 Feb 2007 22:48:37 +0000 (+0000)
Subject: Adding required plexus:merge
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b58178fab171f8c15d00764702f69eebf2d5428c;p=archiva.git

Adding required plexus:merge

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

diff --git a/archiva-MRM-239/archiva-security/pom.xml b/archiva-MRM-239/archiva-security/pom.xml
index 78cbd1282..c00645553 100644
--- a/archiva-MRM-239/archiva-security/pom.xml
+++ b/archiva-MRM-239/archiva-security/pom.xml
@@ -42,4 +42,26 @@
       <artifactId>plexus-component-api</artifactId>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>merge</id>
+            <goals>
+              <goal>merge-descriptors</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+                <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>