Author: ltheussl
Date: Tue Sep 20 23:32:39 2005
New Revision: 290631
URL: http://svn.apache.org/viewcvs?rev=290631&view=rev
Log:
The encoding of changes.xml is not preserved
Modified:
maven/maven-1/plugins/trunk/changes/plugin.jelly
maven/maven-1/plugins/trunk/changes/src/main/org/apache/maven/changes/ReleaseVersion.java
maven/maven-1/plugins/trunk/changes/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/changes/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changes/plugin.jelly?rev=290631&r1=290630&r2=290631&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changes/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/changes/plugin.jelly Tue Sep 20 23:32:39 2005
@@ -23,6 +23,7 @@
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:util="jelly:util"
+ xmlns:c="changes:transform"
xmlns:doc="doc">
<goal name="maven-changes-plugin:register">
@@ -76,12 +77,16 @@
<define:tag name="release-version">
<j:useBean var="transformer"
class="org.apache.maven.changes.ReleaseVersion"/>
<util:file var="f" name="${maven.docs.src}/changes.xml" />
+ <!-- Set default encoding if not set. -->
+ <j:if test="${encoding == null}">
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
+ </j:if>
<j:choose>
<j:when test="${date != null}">
- ${transformer.releaseVersion(f, pom.currentVersion, version, date)}
+ ${transformer.releaseVersion(f, pom.currentVersion, version,
encoding, date)}
</j:when>
<j:otherwise>
- ${transformer.releaseVersion(f, pom.currentVersion, version)}
+ ${transformer.releaseVersion(f, pom.currentVersion, version,
encoding)}
</j:otherwise>
</j:choose>
</define:tag>
Modified:
maven/maven-1/plugins/trunk/changes/src/main/org/apache/maven/changes/ReleaseVersion.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changes/src/main/org/apache/maven/changes/ReleaseVersion.java?rev=290631&r1=290630&r2=290631&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/changes/src/main/org/apache/maven/changes/ReleaseVersion.java
(original)
+++
maven/maven-1/plugins/trunk/changes/src/main/org/apache/maven/changes/ReleaseVersion.java
Tue Sep 20 23:32:39 2005
@@ -32,11 +32,11 @@
*/
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 @@
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 @@
format.setIndentSize( 2 );
format.setNewlines( true );
format.setTrimText( true );
+ format.setEncoding( encoding );
XMLWriter writer = new XMLWriter( format );
writer.setOutputStream( os );
Modified: maven/maven-1/plugins/trunk/changes/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changes/xdocs/changes.xml?rev=290631&r1=290630&r2=290631&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changes/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changes/xdocs/changes.xml Tue Sep 20 23:32:39
2005
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPCHANGES-24">The encoding of
changes.xml is not preserved after <code>scm:prepare-release</code>.</action>
<action dev="aheritier" type="fix">Fix XTHML 1.0 compliance.</action>
<action dev="ltheussl" type="fix" issue="MPCHANGES-22" due-to="Mike
Traum">Document description attribute of release element.</action>
<action dev="brett" type="add">Add a live bookmark link for the RSS for
Firefox.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
