Author: bayard Date: Tue Jul 19 04:32:56 2011 New Revision: 1148152 URL: http://svn.apache.org/viewvc?rev=1148152&view=rev Log: Applying Ville Skyttä's LANG-717 patch to force the encoding in Ant and Maven builds to ISO-8859-1; stopping reported ugly output if your system is running in UTF-8
Modified: commons/proper/lang/trunk/build.xml commons/proper/lang/trunk/default.properties commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/build.xml?rev=1148152&r1=1148151&r2=1148152&view=diff ============================================================================== --- commons/proper/lang/trunk/build.xml (original) +++ commons/proper/lang/trunk/build.xml Tue Jul 19 04:32:56 2011 @@ -59,7 +59,7 @@ <!-- ========== Compile Targets ========================================= --> <target name="compile" depends="init" description="Compile shareable components"> <mkdir dir="${build.home}/classes"/> - <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" includeantruntime="false"> + <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}"> <classpath refid="compile.classpath"/> </javac> <copy todir="${build.home}/classes" filtering="on"> @@ -69,7 +69,7 @@ <target name="compile.tests" depends="compile" description="Compile unit test cases"> <mkdir dir="${build.home}/tests"/> - <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" includeantruntime="false"> + <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}"> <classpath refid="test.classpath"/> </javac> <copy todir="${build.home}/tests" filtering="on"> @@ -120,6 +120,7 @@ bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" + encoding="${compile.encoding}" source="${compile.source}"> <classpath refid="compile.classpath"/> </javadoc> Modified: commons/proper/lang/trunk/default.properties URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1148152&r1=1148151&r2=1148152&view=diff ============================================================================== --- commons/proper/lang/trunk/default.properties (original) +++ commons/proper/lang/trunk/default.properties Tue Jul 19 04:32:56 2011 @@ -77,6 +77,9 @@ compile.target = 1.5 # Valid values are 1.3, 1.4, 1.5. compile.source = 1.5 +# Specifies the source encoding. +compile.encoding = ISO-8859-1 + # Should all tests fail if one does? test.failonerror = true Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1148152&r1=1148151&r2=1148152&view=diff ============================================================================== --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Tue Jul 19 04:32:56 2011 @@ -441,7 +441,7 @@ </dependencies> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.compile.source>1.5</maven.compile.source> <maven.compile.target>1.5</maven.compile.target>