You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/03/09 13:36:22 UTC
git commit: removed XSD generation since it is not published
Repository: maven
Updated Branches:
refs/heads/master c37a20ff6 -> 19247f363
removed XSD generation since it is not published
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/19247f36
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/19247f36
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/19247f36
Branch: refs/heads/master
Commit: 19247f363bee07d1afc6f8902f4083fd890fc47a
Parents: c37a20f
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Mar 9 13:36:19 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Mar 9 13:36:19 2014 +0100
----------------------------------------------------------------------
maven-plugin-api/pom.xml | 10 +++++++---
maven-plugin-api/src/main/mdo/plugin.mdo | 8 +++-----
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/19247f36/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 3a4c104..10c338b 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -73,10 +73,14 @@ under the License.
</configuration>
<executions>
<execution>
- <id>site-docs</id>
+ <id>plugin-site-doc</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xdoc</goal>
+ </goals>
<configuration>
- <models combine.children="append">
- <model>src/main/mdo/plugin.mdo</model><!-- plugin.mdo is only for documentation, not used for code generation -->
+ <models>
+ <model>src/main/mdo/plugin.mdo</model>
</models>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/maven/blob/19247f36/maven-plugin-api/src/main/mdo/plugin.mdo
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo
index 21fbe8a..83bf3bf 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -18,17 +18,15 @@ under the License.
-->
<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"
- xml.namespace="http://maven.apache.org/PLUGIN/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/plugin-${version}.xsd">
+ xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
<id>plugin</id>
<name>PluginDescriptor</name>
<description><![CDATA[
Plugin descriptor, stored in <code>META-INF/maven/plugin.xml</code> in a plugin's jar artifact.
This descriptor is generally generated from plugin sources, using
<a href="/plugins/maven-plugin-plugin/">maven-plugin-plugin</a>.
- <i>Notice:</i> this documentation is generated from a Modello model but the code executed is not generated
- from this descriptor. Please report if you find anything wrong.
+ <p><i>Notice:</i> this documentation is generated from a Modello model but the code executed is not generated
+ from this descriptor. Please report if you find anything wrong.</p>
]]></description>
<defaults>
<default>