You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/05/03 13:39:49 UTC
svn commit: r653054 -
/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: bentmann
Date: Sat May 3 04:39:48 2008
New Revision: 653054
URL: http://svn.apache.org/viewvc?rev=653054&view=rev
Log:
[MCOMPILER-63] Provide specific default value for "encoding" parameter
o Reverted default encoding to platform encoding (http://www.nabble.com/-POLL--Default-Value-for-File-Encoding-td16958386.html)
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=653054&r1=653053&r2=653054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Sat May 3 04:39:48 2008
@@ -123,8 +123,6 @@
/**
* The -encoding argument for the Java compiler.
- * <br/>
- * <b>Note</b>: Since 2.1, the default value is locked to <code>ISO-8859-1</code> to better reproducing build.
*
* @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
*/
@@ -268,16 +266,6 @@
* @readonly
*/
private MavenSession session;
-
- /**
- * Gets the source file encoding.
- *
- * @return The source file encoding, never <code>null</code>.
- */
- protected String getEncoding()
- {
- return ( encoding == null ) ? "ISO-8859-1" : encoding;
- }
protected abstract SourceInclusionScanner getSourceInclusionScanner( int staleMillis );
@@ -389,7 +377,7 @@
compilerConfiguration.setTargetVersion( target );
- compilerConfiguration.setSourceEncoding( getEncoding() );
+ compilerConfiguration.setSourceEncoding( encoding );
if ( ( compilerArguments != null ) || ( compilerArgument != null ) )
{