[MRELEASE-601] The Maven 2 release plugin modifies CDATA elements in pom.xml files.
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
index 68063a5..9aef4cf 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -89,7 +89,7 @@
String content = ReleaseUtil.readXmlFile( pomFile, ls );
// we need to eliminate any extra whitespace inside elements, as JDOM will nuke it
content = content.replaceAll( "<([^!][^>]*?)\\s{2,}([^>]*?)>", "<$1 $2>" );
- content = content.replaceAll( "(\\s{2,}|[^\\s])/>", "$1 />" );
+ content = content.replaceAll( "(\\s{2,})/>", "$1 />" );
SAXBuilder builder = new SAXBuilder();
document = builder.build( new StringReader( content ) );
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/expected-pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/expected-pom.xml
index a61a0e2..33be3cb 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/expected-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/expected-pom.xml
@@ -59,6 +59,7 @@
</content>
</file>
</additionalConfig>
+ <replacetoken><![CDATA[<distributable/>]]></replacetoken>
</configuration>
</plugin>
</plugins>
diff --git a/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/pom.xml b/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/pom.xml
index 03de6e3..bde3f47 100644
--- a/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/pom.xml
+++ b/maven-release-manager/src/test/resources/projects/rewrite-for-release/cdata-section/pom.xml
@@ -59,6 +59,7 @@
</content>
</file>
</additionalConfig>
+ <replacetoken><![CDATA[<distributable/>]]></replacetoken>
</configuration>
</plugin>
</plugins>
