Author: jdumay
Date: Tue Feb 10 23:43:05 2009
New Revision: 743169
URL: http://svn.apache.org/viewvc?rev=743169&view=rev
Log:
MRM-995 - Generated Descriptors are wrong after Eclipse Project Clean
* Submitted by Steffen Grunwald. Thanks for the patch :)
Modified:
archiva/trunk/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/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-scheduled/pom.xml
archiva/trunk/pom.xml
Propchange: archiva/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 10 23:43:05 2009
@@ -6,3 +6,4 @@
.settings
.classpath
.project
+.pom.xml.swp
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=743169&r1=743168&r2=743169&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
Tue Feb 10 23:43:05 2009
@@ -61,6 +61,7 @@
<artifactId>plexus-maven-plugin</artifactId>
<executions>
<execution>
+ <phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>
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=743169&r1=743168&r2=743169&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
Tue Feb 10 23:43:05 2009
@@ -54,6 +54,7 @@
<executions>
<execution>
<id>descriptor</id>
+ <phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>
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=743169&r1=743168&r2=743169&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Tue Feb
10 23:43:05 2009
@@ -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>
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=743169&r1=743168&r2=743169&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
Tue Feb 10 23:43:05 2009
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=743169&r1=743168&r2=743169&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Tue Feb 10 23:43:05
2009
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=743169&r1=743168&r2=743169&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Feb 10 23:43:05 2009
@@ -98,6 +98,7 @@
<executions>
<execution>
<id>generate</id>
+ <phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>
