Author: jdumay
Date: Tue Feb 10 23:54:32 2009
New Revision: 743171
URL: http://svn.apache.org/viewvc?rev=743171&view=rev
Log:
Rolling back MRM-995 as it seemed to have broken lots of things
Modified:
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
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=743171&r1=743170&r2=743171&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:54:32 2009
@@ -61,7 +61,6 @@
<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=743171&r1=743170&r2=743171&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:54:32 2009
@@ -54,7 +54,6 @@
<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=743171&r1=743170&r2=743171&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:54:32 2009
@@ -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>
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=743171&r1=743170&r2=743171&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:54:32 2009
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=743171&r1=743170&r2=743171&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Tue Feb 10 23:54:32
2009
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=743171&r1=743170&r2=743171&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Feb 10 23:54:32 2009
@@ -98,7 +98,6 @@
<executions>
<execution>
<id>generate</id>
- <phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>
