diff options
| author | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
|---|---|---|
| committer | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
| commit | dee0d5a300ee0ba0240efc1277428b52cdcec9e0 (patch) | |
| tree | 0f4c8d3b8b8b0468deac3c8851380a68bfa1744e /archiva-security | |
| parent | 2b50a18d22ef8972d241f54c20a131e05a584ac4 (diff) | |
| download | archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.tar.gz archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.zip | |
Merge from archiva-MRM-239 branch to trunk. r506385:HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@511053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-security')
| -rw-r--r-- | archiva-security/pom.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/archiva-security/pom.xml b/archiva-security/pom.xml index 78cbd1282..c00645553 100644 --- a/archiva-security/pom.xml +++ b/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> |