From 38468ab042faad8a454c3510a558e50357cd5458 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 7 Sep 2010 14:47:48 +0200
Subject: [PATCH 1/3] Use plexus-component-metadata

---
 doxia-modules/doxia-module-apt/pom.xml            |    8 ++++----
 doxia-modules/doxia-module-docbook-simple/pom.xml |    6 +++---
 doxia-modules/doxia-module-fml/pom.xml            |    6 +++---
 doxia-modules/doxia-module-xdoc/pom.xml           |    6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
index e2c3a20..4b1d7fd 100644
--- a/doxia-modules/doxia-module-apt/pom.xml
+++ b/doxia-modules/doxia-module-apt/pom.xml
@@ -49,21 +49,21 @@ under the License.
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
index cd54c74..920658b 100644
--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
+++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
@@ -45,17 +45,17 @@ under the License.
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
index b14bb65..d4048b3 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -77,17 +77,17 @@ under the License.
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
index fbf6a14..af4fbc9 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -58,17 +58,17 @@ under the License.
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <configuration>
           <descriptors>
             <descriptor>src/main/components/components.xml</descriptor>
-            <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+            <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
           <execution>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
           </execution>
         </executions>
-- 
1.7.2.2