svn commit: r1410886 - in /maven/maven-3/trunk: maven-model/src/main/mdo/maven.mdo pom.xml

[hb...@apache.org]

Author: hboutemy
Date: Sun Nov 18 13:29:18 2012
New Revision: 1410886

URL: http://svn.apache.org/viewvc?rev=1410886&view=rev
Log:
[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

Modified:
    maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
    maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo?rev=1410886&r1=1410885&r2=1410886&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Sun Nov 18 13:29:18 2012
@@ -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>

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1410886&r1=1410885&r2=1410886&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Sun Nov 18 13:29:18 2012
@@ -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>