aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base
diff options
context:
space:
mode:
Diffstat (limited to 'archiva-modules/archiva-base')
-rw-r--r--archiva-modules/archiva-base/archiva-artifact-converter/pom.xml1
-rw-r--r--archiva-modules/archiva-base/archiva-dependency-graph/pom.xml1
-rw-r--r--archiva-modules/archiva-base/archiva-policies/pom.xml3
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/pom.xml3
4 files changed, 2 insertions, 6 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>