Author: hboutemy
Date: Sat Jul 20 22:03:41 2013
New Revision: 1505220
URL: http://svn.apache.org/r1505220
Log:
[MPLUGIN-250] created plugin-metadata descriptor version 1.1.0 to add the since
element, which cannot be added into already released 1.0.0 version
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml
maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml
Sat Jul 20 22:03:41 2013
@@ -21,8 +21,8 @@
<!-- START SNIPPET: ant-mojo -->
<pluginMetadata
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
- xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
http://maven.apache.org/xsd/plugin-metadata-1.0.0.xsd";>
+ xmlns="http://maven.apache.org/PLUGIN-METADATA/1.1.0";
+ xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.1.0
http://maven.apache.org/xsd/plugin-metadata-1.1.0.xsd";>
<mojos>
<mojo>
<!-- target name to call in ant script -->
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
Sat Jul 20 22:03:41 2013
@@ -21,7 +21,7 @@
<pluginMetadata
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
- xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
../../../../../../maven-plugin-tools-model/target/generated-site/xsd/plugin/metadata-1.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
http://maven.apache.org/xsd/plugin-metadata-1.0.0.xsd";>
<mojos>
<mojo>
<call>test</call>
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
Sat Jul 20 22:03:41 2013
@@ -21,7 +21,7 @@
<pluginMetadata
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
- xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
../../../../../../maven-plugin-tools-model/target/generated-site/xsd/plugin-metadata-1.0.0.xsd
">
+ xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
http://maven.apache.org/xsd/plugin-metadata-1.0.0.xsd";>
<mojos>
<mojo>
<call>test</call>
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
Sat Jul 20 22:03:41 2013
@@ -19,8 +19,8 @@
-->
<pluginMetadata
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
- xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
http://maven.apache.org/xsd/plugin-metadata-1.0.0.xsd";>
+ xmlns="http://maven.apache.org/PLUGIN-METADATA/1.1.0";
+ xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.1.0
http://maven.apache.org/xsd/plugin-metadata-1.1.0.xsd";>
<mojos>
<mojo>
<goal>sample</goal>
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml
Sat Jul 20 22:03:41 2013
@@ -19,8 +19,8 @@
-->
<pluginMetadata
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
- xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.0.0
http://maven.apache.org/xsd/plugin-metadata-1.0.0.xsd";>
+ xmlns="http://maven.apache.org/PLUGIN-METADATA/1.1.0";
+ xsi:schemaLocation="http://maven.apache.org/PLUGIN-METADATA/1.1.0
http://maven.apache.org/xsd/plugin-metadata-1.1.0.xsd";>
<mojos>
<mojo>
<goal>sample</goal>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml Sat Jul 20
22:03:41 2013
@@ -60,7 +60,8 @@
<models>
<model>src/main/mdo/plugin-metadata.mdo</model>
</models>
- <version>1.0.0</version>
+ <version>1.1.0</version>
+ <firstVersion>1.0.0</firstVersion>
</configuration>
<executions>
<execution>
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo?rev=1505220&r1=1505219&r2=1505220&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
Sat Jul 20 22:03:41 2013
@@ -68,7 +68,7 @@
-->
<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0
http://modello.codehaus.org/xsd/modello-1.4.0.xsd";
- xsd.namespace="http://maven.apache.org/PLUGIN-METADATA/1.0.0";
+ xsd.namespace="http://maven.apache.org/PLUGIN-METADATA/${version}";
xml.schemaLocation="http://maven.apache.org/xsd/plugin-metadata-${version}.xsd";>
<id>plugin-metadata</id>
<name>PluginMetadata</name>
@@ -84,12 +84,12 @@
<classes>
<class rootElement="true" xml.tagName="pluginMetadata">
<name>PluginMetadata</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>Root element of a script-based mojo's plugin metadata
bindings.</description>
<fields>
<field>
<name>mojos</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<description>The list of mojos contained in the accompanying
script.</description>
<association>
@@ -101,69 +101,69 @@
</class>
<class>
<name>Mojo</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>Mojo descriptor definition.</description>
<fields>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>goal</name>
<type>String</type>
<required>true</required>
<description>The name of the goal used to invoke this
mojo.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>phase</name>
<type>String</type>
<description>The phase to which this mojo should be bound by
default.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>aggregator</name>
<type>boolean</type>
<description>Whether this mojo operates as an aggregator when the
reactor is run. That is, only runs once.
</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>requiresDependencyResolution</name>
<type>String</type>
<description>The scope of dependencies that this mojo requires to
have resolved.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>requiresProject</name>
<type>boolean</type>
<description>Whether this mojo requires a project instance in order
to execute.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>requiresReports</name>
<type>boolean</type>
<description>Whether this mojo requires a reports section in the
POM.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>requiresOnline</name>
<type>boolean</type>
<description>Whether this mojo requires online mode to operate
normally.</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>inheritByDefault</name>
<type>boolean</type>
<description>Whether this mojo's configuration should propagate down
the POM inheritance chain by default.
</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>requiresDirectInvocation</name>
<type>boolean</type>
<description>If true, this mojo can only be directly invoked (eg.
specified directly on the command line).
</description>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>execution</name>
<description>Information about a sub-execution of the Maven
lifecycle which should be processed.</description>
<association>
@@ -171,7 +171,7 @@
</association>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>components</name>
<description>List of plexus components required by this
mojo.</description>
<association>
@@ -180,7 +180,7 @@
</association>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<name>parameters</name>
<description>List of parameters used by this mojo.</description>
<association>
@@ -190,24 +190,24 @@
</field>
<field>
<name>description</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>The description for this parameter.</description>
<type>String</type>
</field>
<field xml.tagName="deprecated">
<name>deprecation</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>A deprecation message for this mojo
parameter.</description>
<type>String</type>
</field>
<field>
- <version>1.0.0</version>
+ <version>1.1.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>
+ <version>1.0.0+</version>
<name>call</name>
<type>String</type>
<description>The target/method within the script to call when this
mojo executes.</description>
@@ -216,14 +216,14 @@
</class>
<class>
<name>LifecycleExecution</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description><![CDATA[
A sub-process execution of a lifecycle to satisfy the needs of a mojo.
]]></description>
<fields>
<field>
<name>lifecycle</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>The name of the overlay to apply to the sub-lifecycle
before executing it. If specified, this
lifecycle overlay definition will be bundled with the plugin.
@@ -231,13 +231,13 @@
</field>
<field>
<name>phase</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>The phase in the sub-lifecycle.</description>
<type>String</type>
</field>
<field>
<name>goal</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>A goal, not attached to a lifecycle phase, which should
be executed ahead of this mojo.
</description>
<type>String</type>
@@ -246,21 +246,21 @@
</class>
<class>
<name>Component</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description><![CDATA[
A reference to a plexus component, assumed to be available to the
plugin container.
]]></description>
<fields>
<field>
<name>role</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>The component role to lookup.</description>
<required>true</required>
<type>String</type>
</field>
<field>
<name>hint</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>The role-hint to lookup.</description>
</field>
@@ -268,39 +268,39 @@
</class>
<class>
<name>Parameter</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description><![CDATA[
A parameter used by a mojo, and configurable from the command line or
POM configuration sections.
]]></description>
<fields>
<field>
<name>name</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>The parameter name</description>
<required>true</required>
<type>String</type>
</field>
<field>
<name>alias</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>An alternate name for the parameter.</description>
</field>
<field>
<name>property</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>The JavaBeans property name to use to configure the
mojo with this parameter.</description>
</field>
<field>
<name>required</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<description>Whether this parameter is required.</description>
</field>
<field>
<name>readonly</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<description><