Repository: cassandra Updated Branches: refs/heads/trunk de405f2b6 -> 02d8ebd8a
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/02d8ebd8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02d8ebd8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02d8ebd8 Branch: refs/heads/trunk Commit: 02d8ebd8a485fed03245c3657093af694fea1688 Parents: de405f2 Author: Paulo Motta <[email protected]> Authored: Wed Jan 27 07:59:03 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Wed Jan 27 07:59:03 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02d8ebd8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 36fe427..3d53e9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.4 + * Set javac encoding to utf-8 (CASSANDRA-11077) * Integrate SASI index into Cassandra (CASSANDRA-10661) * Add --skip-flush option to nodetool snapshot * Skip values for non-queried columns (CASSANDRA-10657) http://git-wip-us.apache.org/repos/asf/cassandra/blob/02d8ebd8/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 035628a..16cebef 100644 --- a/build.xml +++ b/build.xml @@ -759,14 +759,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}"/> @@ -792,7 +792,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" /> @@ -1130,7 +1130,8 @@ destdir="${test.classes}" includeantruntime="false" source="${source.version}" - target="${target.version}"> + target="${target.version}" + encoding="utf-8"> <classpath> <path refid="cassandra.classpath"/> </classpath>
