You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/08 00:00:08 UTC
svn commit: r354890 - in /maven/maven-1/plugins/trunk/release: plugin.jelly
src/main/org/apache/maven/release/AbstractPomTransformer.java
xdocs/changes.xml
Author: ltheussl
Date: Wed Dec 7 15:00:04 2005
New Revision: 354890
URL: http://svn.apache.org/viewcvs?rev=354890&view=rev
Log:
PR: MPRELEASE-12
Submitted by: Dennis Lundberg
The encoding of the project.xml file is not preserved
after doing release:transform.
Modified:
maven/maven-1/plugins/trunk/release/plugin.jelly
maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java
maven/maven-1/plugins/trunk/release/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/release/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/plugin.jelly?rev=354890&r1=354889&r2=354890&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/release/plugin.jelly Wed Dec 7 15:00:04 2005
@@ -128,8 +128,12 @@
<j:set var="required" value="${transformer.transformRequired()}" />
<j:if test="${required}">
<ant:echo>Updating POM with version ${version}; tag ${tag}</ant:echo>
+ <!-- Set default encoding if not set. -->
+ <j:if test="${encoding == null}">
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
+ </j:if>
${transformer.transformNodes()}
- ${transformer.write()}
+ ${transformer.write(encoding)}
</j:if>
</define:tag>
</define:taglib>
@@ -189,8 +193,12 @@
default="yes"/>
<j:if test="${answer == 'yes'}">
+ <!-- Set default encoding if not set. -->
+ <j:if test="${encoding == null}">
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
+ </j:if>
<!-- Write out the pom. -->
- ${transformer.write()}
+ ${transformer.write(encoding)}
</j:if>
</j:if>
@@ -203,7 +211,11 @@
transformations="transformations"/>
${transformer.transformNodes()}
- ${transformer.write()}
+ <!-- Set default encoding if not set. -->
+ <j:if test="${encoding == null}">
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
+ </j:if>
+ ${transformer.write(encoding)}
</goal>
@@ -212,7 +224,11 @@
transformer="transformer"
transformations="transformations"/>
${transformer.transformNodes()}
- ${transformer.write()}
+ <!-- Set default encoding if not set. -->
+ <j:if test="${encoding == null}">
+ <j:set var="encoding" value="${maven.docs.outputencoding}" />
+ </j:if>
+ ${transformer.write(encoding)}
</goal>
<!--
Modified: maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java?rev=354890&r1=354889&r2=354890&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java (original)
+++ maven/maven-1/plugins/trunk/release/src/main/org/apache/maven/release/AbstractPomTransformer.java Wed Dec 7 15:00:04 2005
@@ -301,6 +301,16 @@
public void write()
throws Exception
{
+ write( null );
+ }
+
+ /**
+ *
+ * @throws Exception
+ */
+ public void write( String encoding )
+ throws Exception
+ {
OutputStream os = null;
if ( getOutputFile() != null )
@@ -320,6 +330,10 @@
format.setIndentSize( 2 );
format.setNewlines( true );
format.setTrimText( true );
+ if ( encoding != null )
+ {
+ format.setEncoding( encoding );
+ }
XMLWriter writer = new XMLWriter( format );
writer.setOutputStream( os );
Modified: maven/maven-1/plugins/trunk/release/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/xdocs/changes.xml?rev=354890&r1=354889&r2=354890&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/release/xdocs/changes.xml Wed Dec 7 15:00:04 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPRELEASE-12" due-to="Dennis Lundberg">The encoding of the project.xml file is not preserved after doing <code>release:transform</code>.</action>
<action dev="brett" type="fix" issue="MPRELEASE-11">handle non-jar dependencies</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>