Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Herve Boutemy 2012-11-18 13:29:18 +00:00
parent aac56f0f97
commit 7def319030
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maven-model/src/main/mdo/maven.mdo
View File

@ -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>

2
pom.xml
View File

@ -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>