From 034f98a5096de1a9899a11e3850bafa4d1a0166a Mon Sep 17 00:00:00 2001
From: James William Dumay <jdumay@apache.org>
Date: Tue, 10 Feb 2009 23:43:05 +0000
Subject: [PATCH] MRM-995 - Generated Descriptors are wrong after Eclipse
 Project Clean

* Submitted by Steffen Grunwald. Thanks for the patch :)



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743169 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-base/archiva-artifact-converter/pom.xml            | 1 +
 archiva-modules/archiva-base/archiva-dependency-graph/pom.xml  | 1 +
 archiva-modules/archiva-base/archiva-policies/pom.xml          | 3 ++-
 archiva-modules/archiva-base/archiva-repository-layer/pom.xml  | 3 ++-
 archiva-modules/archiva-scheduled/pom.xml                      | 2 ++
 pom.xml                                                        | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index f23ee3a20..079dc519d 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -61,6 +61,7 @@
         <artifactId>plexus-maven-plugin</artifactId>
         <executions>
           <execution>
+          	<phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
index a03cebe34..15eb05f85 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
@@ -54,6 +54,7 @@
         <executions>
           <execution>
             <id>descriptor</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 7489f08bc..615272d59 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -58,11 +58,12 @@
         <executions>
           <execution>
             <id>merge</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>merge-descriptors</goal>
             </goals>
             <configuration>
-              <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+              <output>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</output>
               <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>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index de93e0429..a00af1b98 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -81,11 +81,12 @@
           </execution>
           <execution>
             <id>merge</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>merge-descriptors</goal>
             </goals>
             <configuration>
-              <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+              <output>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</output>
               <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>
diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml
index f3c289882..45209a93f 100644
--- a/archiva-modules/archiva-scheduled/pom.xml
+++ b/archiva-modules/archiva-scheduled/pom.xml
@@ -90,10 +90,12 @@
         <executions>
           <execution>
             <id>merge</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>merge-descriptors</goal>
             </goals>
             <configuration>
+              <output>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</output>
               <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>
diff --git a/pom.xml b/pom.xml
index d2a342c4e..4e2e6592d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,7 @@
         <executions>
           <execution>
             <id>generate</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
-- 
2.39.5