Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
James William Dumay 2009-02-10 23:54:32 +00:00
parent 034f98a509
commit e2dda2e977
6 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
View File

@ -61,7 +61,6 @@
<artifactId>plexus-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>

1
archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
View File

@ -54,7 +54,6 @@
<executions>
<execution>
<id>descriptor</id>
<phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>

3
archiva-modules/archiva-base/archiva-policies/pom.xml
View File

@ -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>

3
archiva-modules/archiva-base/archiva-repository-layer/pom.xml
View File

@ -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>

2
archiva-modules/archiva-scheduled/pom.xml
View File

@ -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>

1
pom.xml
View File

@ -98,7 +98,6 @@
<executions>
<execution>
<id>generate</id>
<phase>generate-resources</phase>
<goals>
<goal>descriptor</goal>
</goals>