From e2dda2e977c423ad34240210557f2cd4ea6b18e0 Mon Sep 17 00:00:00 2001
From: James William Dumay <jdumay@apache.org>
Date: Tue, 10 Feb 2009 23:54:32 +0000
Subject: [PATCH] Rolling back MRM-995 as it seemed to have broken lots of
 things

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@743171 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, 2 insertions(+), 9 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index 079dc519d..f23ee3a20 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -61,7 +61,6 @@
         <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 15eb05f85..a03cebe34 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
@@ -54,7 +54,6 @@
         <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 615272d59..7489f08bc 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -58,12 +58,11 @@
         <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>
+              <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>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index a00af1b98..de93e0429 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -81,12 +81,11 @@
           </execution>
           <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>
+              <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>
diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml
index 45209a93f..f3c289882 100644
--- a/archiva-modules/archiva-scheduled/pom.xml
+++ b/archiva-modules/archiva-scheduled/pom.xml
@@ -90,12 +90,10 @@
         <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 4e2e6592d..d2a342c4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,6 @@
         <executions>
           <execution>
             <id>generate</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>
-- 
2.39.5