You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/07/12 11:42:27 UTC
[2/3] maven-archetype git commit: [ARCHETYPE-502] XMLOutputter
generates files with inconsistent line ending on Windows
[ARCHETYPE-502] XMLOutputter generates files with inconsistent line ending on Windows
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/11907b61
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/11907b61
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/11907b61
Branch: refs/heads/master
Commit: 11907b619a2c363def22fe5a2d8decc8a89ffeca
Parents: 50ec46b
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Jul 12 13:04:46 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Jul 12 13:04:46 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/archetype/common/util/XMLOutputter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/11907b61/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
index 25fde61..ff25994 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
@@ -52,6 +52,7 @@ package org.apache.maven.archetype.common.util;
* on the JDOM Project, please see <http://www.jdom.org/>.
*/
+import org.codehaus.plexus.util.StringUtils;
import org.jdom.Attribute;
import org.jdom.CDATA;
import org.jdom.Comment;
@@ -854,7 +855,7 @@ public class XMLOutputter
throws IOException
{
out.write( "<!--" );
- out.write( comment.getText() );
+ out.write( StringUtils.unifyLineSeparators( comment.getText(), currentFormat.lineSeparator ) );
out.write( "-->" );
}