From eefe89fb9e3e80b09429cc659079d29021d72ce1 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Wed, 21 Sep 2005 06:32:39 +0000 Subject: [PATCH] The encoding of changes.xml is not preserved git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290631 13f79535-47bb-0310-9956-ffa450edef68 --- changes/plugin.jelly | 9 +++++++-- .../main/org/apache/maven/changes/ReleaseVersion.java | 7 ++++--- changes/xdocs/changes.xml | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/changes/plugin.jelly b/changes/plugin.jelly index 9bf40fa8..9f5a493f 100644 --- a/changes/plugin.jelly +++ b/changes/plugin.jelly @@ -23,6 +23,7 @@ xmlns:ant="jelly:ant" xmlns:define="jelly:define" xmlns:util="jelly:util" + xmlns:c="changes:transform" xmlns:doc="doc"> @@ -76,12 +77,16 @@ + + + + - ${transformer.releaseVersion(f, pom.currentVersion, version, date)} + ${transformer.releaseVersion(f, pom.currentVersion, version, encoding, date)} - ${transformer.releaseVersion(f, pom.currentVersion, version)} + ${transformer.releaseVersion(f, pom.currentVersion, version, encoding)} diff --git a/changes/src/main/org/apache/maven/changes/ReleaseVersion.java b/changes/src/main/org/apache/maven/changes/ReleaseVersion.java index b5e71e6e..1a1e663a 100644 --- a/changes/src/main/org/apache/maven/changes/ReleaseVersion.java +++ b/changes/src/main/org/apache/maven/changes/ReleaseVersion.java @@ -32,11 +32,11 @@ import org.dom4j.io.*; */ public class ReleaseVersion { - public static final void releaseVersion( File changesFile, String currentVersion, String version ) + public static final void releaseVersion( File changesFile, String currentVersion, String version, String encoding) throws DocumentException, FileNotFoundException, UnsupportedEncodingException, IOException { DateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" ); - releaseVersion( changesFile, currentVersion, version, dateFormat.format( new Date() ) ); + releaseVersion( changesFile, currentVersion, version, encoding, dateFormat.format( new Date() ) ); } static final Document transformVersion( File changesFile, String currentVersion, String version, String date ) @@ -101,7 +101,7 @@ public class ReleaseVersion return null; } - public static final void releaseVersion( File changesFile, String currentVersion, String version, String date ) + public static final void releaseVersion( File changesFile, String currentVersion, String version, String encoding, String date ) throws DocumentException, FileNotFoundException, UnsupportedEncodingException, IOException { Document doc = transformVersion( changesFile, currentVersion, version, date ); @@ -120,6 +120,7 @@ public class ReleaseVersion format.setIndentSize( 2 ); format.setNewlines( true ); format.setTrimText( true ); + format.setEncoding( encoding ); XMLWriter writer = new XMLWriter( format ); writer.setOutputStream( os ); diff --git a/changes/xdocs/changes.xml b/changes/xdocs/changes.xml index f6013024..c518b349 100644 --- a/changes/xdocs/changes.xml +++ b/changes/xdocs/changes.xml @@ -25,6 +25,7 @@ + The encoding of changes.xml is not preserved after scm:prepare-release. Fix XTHML 1.0 compliance. Document description attribute of release element. Add a live bookmark link for the RSS for Firefox.