From d3b5a9226c9858596dd7b69dfd4948fa99a90fc6 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 29 Jun 2012 13:26:08 +0000
Subject: [PATCH] [MPLUGIN-218] Tag 'since' not recognized in the plugin model
 Submitted by Tinguaro Barreno.

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1355361 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-plugin/pom.xml                   |  5 ++++
 .../src/it/ant-since-maven-plugin/pom.xml     | 30 +++++++++++++++++++
 .../src/main/scripts/sample.build.xml         | 17 +++++++++++
 .../src/main/scripts/sample.mojos.xml         | 25 ++++++++++++++++
 .../src/main/mdo/plugin-metadata.mdo          | 12 ++++++++
 5 files changed, 89 insertions(+)
 create mode 100644 maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
 create mode 100644 maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.build.xml
 create mode 100644 maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml

diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 6d24bbc..c3fff06 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -151,6 +151,11 @@
       <artifactId>maven-plugin-tools-annotations</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-model</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- plexus -->
     <dependency>
diff --git a/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml b/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
new file mode 100644
index 0000000..2240fa9
--- /dev/null
+++ b/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
@@ -0,0 +1,30 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>test</groupId>
+  <artifactId>trivial-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>1.0</version>
+  <name>trivial-maven-plugin</name>
+  <description>Just a test project</description>
+  <url>http://nowere.test</url>
+  <inceptionYear>2012</inceptionYear>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>@project.version@</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-tools-ant</artifactId>
+            <version>@project.version@</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.build.xml b/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.build.xml
new file mode 100644
index 0000000..227badb
--- /dev/null
+++ b/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.build.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ant-tasks">
+  <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Global Properties -->
+  <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+
+  <!-- taskdef resource="net/sf/antcontrib/antcontrib.properties"/-->
+
+  <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+  <!-- Main task -->
+  <!-- +++++++++++++++++++++++++++++++++++++++++++ -->
+  <target name="sample-task">
+
+    <echo message="${message}."/>
+
+  </target>
+</project>
diff --git a/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml b/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
new file mode 100644
index 0000000..16753a4
--- /dev/null
+++ b/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pluginMetadata>
+  <mojos>
+    <mojo>
+      <goal>sample</goal>
+      <call>sample-task</call>
+      <description>Just a test</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>false</requiresProject>
+      <since>1.0</since>
+      <parameters>
+
+        <parameter>
+          <name>message</name>
+          <type>java.lang.String</type>
+          <required>true</required>
+          <readonly>true</readonly>
+          <since>1.0</since>
+          <description>Test param</description>
+        </parameter>
+
+      </parameters>
+    </mojo>
+  </mojos>
+</pluginMetadata>
diff --git a/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo b/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
index ea9adf5..c6baec2 100644
--- a/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
+++ b/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
@@ -200,6 +200,12 @@
           <description>A deprecation message for this mojo parameter.</description>
           <type>String</type>
         </field>
+        <field>
+          <version>1.0.0</version>
+          <name>since</name>
+          <type>String</type>
+          <description>Version when the mojo was added to the API.</description>
+        </field>
         <field>
           <version>1.0.0</version>
           <name>call</name>
@@ -339,6 +345,12 @@
           <description>A deprecation message for this mojo parameter.</description>
           <type>String</type>
         </field>
+        <field>
+          <version>1.0.0</version>
+          <name>since</name>
+          <type>String</type>
+          <description>Version when the parameter was added.</description>
+        </field>
       </fields>
     </class>
   </classes>