diff options
12 files changed, 30 insertions, 48 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index f23ee3a20..2a3232fa4 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -58,11 +58,11 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> <goals> - <goal>descriptor</goal> + <goal>generate-metadata</goal> </goals> </execution> </executions> diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 2be615090..73325003c 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -71,7 +71,7 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> </plugin> </plugins> </build> diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 4d6752164..eefdbc47a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -41,7 +41,7 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> </plugin> </plugins> </build> diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index a03cebe34..c95065013 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -50,12 +50,12 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> <id>descriptor</id> <goals> - <goal>descriptor</goal> + <goal>generate-metadata</goal> </goals> </execution> </executions> diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 1318d53a2..fae3ca346 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -54,7 +54,7 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> </plugin> <plugin> <groupId>org.codehaus.modello</groupId> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 7489f08bc..0e8c2e01e 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -54,18 +54,25 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> + <id>descriptor</id> + <phase>generate-resources</phase> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + <execution> <id>merge</id> + <phase>generate-resources</phase> <goals> - <goal>merge-descriptors</goal> + <goal>merge-metadata</goal> </goals> <configuration> - <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> + <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor> </descriptors> </configuration> </execution> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index de93e0429..67c967173 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -71,24 +71,23 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> <id>descriptor</id> <goals> - <goal>descriptor</goal> + <goal>generate-metadata</goal> </goals> </execution> <execution> <id>merge</id> <goals> - <goal>merge-descriptors</goal> + <goal>merge-metadata</goal> </goals> <configuration> - <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> + <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor> </descriptors> </configuration> </execution> diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 80177618d..20960eed0 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -53,28 +53,4 @@ <artifactId>plexus-utils</artifactId> </dependency> </dependencies> - <!-- - <build> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <executions> - <execution> - <id>merge</id> - <goals> - <goal>merge-descriptors</goal> - </goals> - <configuration> - <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> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - --> </project> diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index fad154168..097c4e3c5 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -95,7 +95,7 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> </plugin> </plugins> </build> diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index f3c289882..ddaa5a251 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -86,17 +86,17 @@ <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> <id>merge</id> <goals> - <goal>merge-descriptors</goal> + <goal>merge-metadata</goal> </goals> <configuration> <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> + <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor> </descriptors> </configuration> </execution> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 587810faf..bf6b8c33c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -449,7 +449,7 @@ </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <configuration> <roleDefaults> <roleDefault> @@ -93,13 +93,13 @@ </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.5</version> + <artifactId>plexus-component-metadata</artifactId> + <version>1.0-beta-3.0.5</version> <executions> <execution> <id>generate</id> <goals> - <goal>descriptor</goal> + <goal>generate-metadata</goal> </goals> </execution> </executions> |