Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
View File

@ -60,19 +60,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>

16
archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
View File

@ -51,20 +51,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>

9
archiva-modules/archiva-base/archiva-policies/pom.xml
View File

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

7
archiva-modules/archiva-base/archiva-repository-layer/pom.xml
View File

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

3
archiva-modules/archiva-scheduled/pom.xml
View File

@ -102,9 +102,10 @@
<goals> <goals>
<goal>merge-metadata</goal> <goal>merge-metadata</goal>
</goals> </goals>
<phase>process-resources</phase>
<configuration> <configuration>
<descriptors> <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> <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>

0
archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml → archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components-fragment.xml
View File

1
pom.xml
View File

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