Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The encoding of changes.xml is not preserved

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290631 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl
2005-09-21 06:32:39 +00:00
parent a51bfd7f6b
commit eefe89fb9e
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
changes/plugin.jelly
View File

@@ -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>

7
changes/src/main/org/apache/maven/changes/ReleaseVersion.java
View File

@@ -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 );

1
changes/xdocs/changes.xml
View File

@@ -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>