From c6c2f0cf39913a369ce4da64634b4848cde55f5a Mon Sep 17 00:00:00 2001
From: mindthegab <gabriele@apache.org>
Date: Wed, 31 Aug 2011 15:13:58 +0000
Subject: [PATCH] -- Fixed issue
 http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=60 -- Now
 maven-amp-plugin works fine with Maven 3.0.3, added prerequisite

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@336 04253f4f-3451-0410-a141-5562f1e59037
---
 plugins/maven-amp-plugin/pom.xml                             | 5 ++++-
 .../java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java  | 4 ++--
 .../src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/maven-amp-plugin/pom.xml b/plugins/maven-amp-plugin/pom.xml
index 790c029b..b752b8f5 100644
--- a/plugins/maven-amp-plugin/pom.xml
+++ b/plugins/maven-amp-plugin/pom.xml
@@ -1,11 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven.plugin</groupId>
     <artifactId>maven-amp-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Alfresco AMP Plugin</name>
     <version>3.0.3-SNAPSHOT</version>
+    <prerequisites>
+        <maven>3.0.3</maven>
+    </prerequisites>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>maven-alfresco-lifecycle</artifactId>
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
index 93b417dc..ad27af1b 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
@@ -282,7 +282,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
     /**
      * The Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib.
      *
-     * @component role="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @component role="org.codehaus.plexus.archiver.Archiver" role-hint="jar"
      * @required
      */
     private JarArchiver mJarArchiver;
@@ -374,7 +374,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
     /**
      * To look up Archiver/UnArchiver implementations
      *
-     * @component role="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
+     * @component role="org.codehaus.plexus.archiver.manager.ArchiverManager"
      * @required
      */
     protected ArchiverManager mArchiverManager;
diff --git a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
index 2355d5b4..10ec1fd1 100644
--- a/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
+++ b/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
@@ -333,7 +333,7 @@ public class AmpMojo extends AbstractAmpMojo
 
     /**
      * The AMP archiver.
-     * @component role="${component.org.codehaus.plexus.archiver.Archiver}" roleHint="amp"
+     * @component role="org.codehaus.plexus.archiver.Archiver" role-hint="amp"
      * @required
      */
     private AmpArchiver mAmpArchiver;