From d40d92527284dfb6a86b6093b2e342db474ce05d Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Thu, 4 Mar 2010 05:05:27 +0000
Subject: [PATCH] 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
---
 .../archiva-artifact-converter/pom.xml           | 15 ---------------
 .../archiva-dependency-graph/pom.xml             | 16 ----------------
 .../archiva-base/archiva-policies/pom.xml        |  9 +--------
 .../archiva-repository-layer/pom.xml             |  7 +------
 archiva-modules/archiva-scheduled/pom.xml        |  3 ++-
 .../{components.xml => components-fragment.xml}  |  0
 pom.xml                                          |  1 +
 7 files changed, 5 insertions(+), 46 deletions(-)
 rename archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/{components.xml => components-fragment.xml} (100%)

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index 8d5355c94..c713ddfc6 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
index 9fc20eb40..3f6e58938 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 0fa1a4e66..9c42e1fed 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index c8aaa9f23..deb62dc55 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml
index 58d80785d..b55fd7bd8 100644
--- a/archiva-modules/archiva-scheduled/pom.xml
+++ b/archiva-modules/archiva-scheduled/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml b/archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components-fragment.xml
similarity index 100%
rename from archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components.xml
rename to archiva-modules/archiva-scheduled/src/main/resources/META-INF/plexus/components-fragment.xml
diff --git a/pom.xml b/pom.xml
index 3c3089a72..e2cde95ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
             <goals>
               <goal>generate-metadata</goal>
             </goals>
+            <phase>generate-resources</phase>
           </execution>
         </executions>
       </plugin>
-- 
2.39.5