Set javac encoding to utf-8 patch by Paulo Motta, reviewed by jasobrown for CASSANDRA-11077
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d98446ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d98446ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d98446ed Branch: refs/heads/cassandra-3.11 Commit: d98446ede1ff786109577ebe9187a84cdea48f40 Parents: 6ff56c3 Author: Paulo Motta <pauloricard...@gmail.com> Authored: Wed Jan 27 07:59:03 2016 -0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jan 11 08:10:41 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d98446ed/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5f37cd7..034ac31 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.11 + * Set javac encoding to utf-8 (CASSANDRA-11077) * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d98446ed/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 2e2c2ef..9755f02 100644 --- a/build.xml +++ b/build.xml @@ -746,14 +746,14 @@ <echo message="${ant.project.name}: ${ant.file}"/> <!-- Order matters! --> <javac fork="true" - debug="true" debuglevel="${debuglevel}" + debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}" memorymaximumsize="512M"> <src path="${interface.thrift.dir}/gen-java"/> <classpath refid="cassandra.classpath"/> </javac> <javac fork="true" - debug="true" debuglevel="${debuglevel}" + debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}" memorymaximumsize="512M"> <src path="${build.src.java}"/> @@ -779,7 +779,7 @@ </path> <target name="stress-build" depends="build" description="build stress tool"> <mkdir dir="${stress.build.classes}" /> - <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}"> + <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}"> <src path="${stress.build.src}" /> <classpath> <path refid="cassandra.classes" /> @@ -1115,7 +1115,8 @@ destdir="${test.classes}" includeantruntime="false" source="${source.version}" - target="${target.version}"> + target="${target.version}" + encoding="utf-8"> <classpath> <path refid="cassandra.classpath"/> </classpath>