Author: jdumay
Date: Wed Feb 11 05:45:52 2009
New Revision: 743238
URL: http://svn.apache.org/viewvc?rev=743238&view=rev
Log:
MRM-1082 - Upgrade from plexus-maven-plugin to the plexus-component-metadata
plugin
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
archiva/trunk/archiva-modules/archiva-database/pom.xml
archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
Wed Feb 11 05:45:52 2009
@@ -58,11 +58,11 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml Wed Feb
11 05:45:52 2009
@@ -71,7 +71,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
</plugin>
</plugins>
</build>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/pom.xml Wed
Feb 11 05:45:52 2009
@@ -41,7 +41,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
</plugin>
</plugins>
</build>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
Wed Feb 11 05:45:52 2009
@@ -50,12 +50,12 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>descriptor</id>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/pom.xml Wed Feb 11
05:45:52 2009
@@ -54,7 +54,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Wed Feb
11 05:45:52 2009
@@ -54,18 +54,25 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <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>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
<configuration>
-
<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>
+
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
Wed Feb 11 05:45:52 2009
@@ -71,24 +71,23 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>descriptor</id>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
<execution>
<id>merge</id>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</goal>
</goals>
<configuration>
-
<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>
+
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/pom.xml Wed
Feb 11 05:45:52 2009
@@ -53,28 +53,4 @@
<artifactId>plexus-utils</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>
Modified: archiva/trunk/archiva-modules/archiva-database/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-database/pom.xml Wed Feb 11 05:45:52
2009
@@ -95,7 +95,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
</plugin>
</plugins>
</build>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Wed Feb 11 05:45:52
2009
@@ -86,17 +86,17 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<id>merge</id>
<goals>
- <goal>merge-descriptors</goal>
+ <goal>merge-metadata</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>
+
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Feb 11
05:45:52 2009
@@ -449,7 +449,7 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<configuration>
<roleDefaults>
<roleDefault>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=743238&r1=743237&r2=743238&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Feb 11 05:45:52 2009
@@ -93,13 +93,13 @@
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.5</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.0-beta-3.0.5</version>
<executions>
<execution>
<id>generate</id>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
