You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/03/18 22:47:28 UTC
[21/50] git commit: [MNG-5380] preserve whitespace in Maven plugin
configuration when elemnt has xml:space="preserve" partial fix,
Modello 1.6 is required but I can't deploy it
[MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve"
partial fix, Modello 1.6 is required but I can't deploy it
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410886 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9bfdb4fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9bfdb4fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9bfdb4fe
Branch: refs/heads/master
Commit: 9bfdb4fe495e17a6adf77e9495ba975c82125172
Parents: db10986
Author: Herve Boutemy <hb...@apache.org>
Authored: Sun Nov 18 13:29:18 2012 +0000
Committer: Herve Boutemy <hb...@apache.org>
Committed: Sun Nov 18 13:29:18 2012 +0000
----------------------------------------------------------------------
maven-model/src/main/mdo/maven.mdo | 12 +++++++-----
pom.xml | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9bfdb4fe/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 389a081..3603660 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2591,16 +2591,18 @@
<field>
<description>
<![CDATA[
- The configuration as DOM object.
- You can control how child POMs inherit configuration from parent POMs by adding <code>combine.children</code>
- or <code>combine.self</code> attributes to the children of the configuration element:
+ <p>The configuration as DOM object.</p>
+ <p>By default, every element content is trimmed, but starting with Maven 3.1.0, you can add
+ <code>xml:space="preserve"</code> to elements you want to preserve whitespace.</p>
+ <p>You can control how child POMs inherit configuration from parent POMs by adding <code>combine.children</code>
+ or <code>combine.self</code> attributes to the children of the configuration element:</p>
<ul>
<li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li>
<li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li>
</ul>
- See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
+ <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
<a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
- for more information.
+ for more information.</p>
]]>
</description>
<name>configuration</name>
http://git-wip-us.apache.org/repos/asf/maven/blob/9bfdb4fe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6df7c7..2f05f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.14</plexusInterpolationVersion>
- <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
+ <plexusUtilsVersion>3.0.9-SNAPSHOT</plexusUtilsVersion>
<sisuInjectVersion>2.3.0</sisuInjectVersion>
<wagonVersion>2.3-SNAPSHOT</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>