adjust Plexus components generation to correct phases so they work from the IDE

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@918853 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-03-04 05:05:27 +00:00
parent f597e36cd3
commit d40d925272
7 changed files with 5 additions and 46 deletions

View File

@ -60,19 +60,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -51,20 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>descriptor</id>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -66,16 +66,9 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>descriptor</id>
<phase>generate-resources</phase>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
<execution>
<id>merge</id>
<phase>generate-resources</phase>
<phase>generate-resources</phase>
<goals>
<goal>merge-metadata</goal>
</goals>

View File

@ -74,17 +74,12 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>descriptor</id>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
<execution>
<id>merge</id>
<goals>
<goal>merge-metadata</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>

View File

@ -102,9 +102,10 @@
<goals>
<goal>merge-metadata</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>

View File

@ -103,6 +103,7 @@
<goals>
<goal>generate-metadata</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>