Updated Branches: refs/heads/cassandra-1.0 08eebcdf4 -> f8567d15f
explicitly set java source and target to 1.6 for the ant tasks patch by dbrosius reviewed by slebresne for CASSANDRA-5533 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8567d15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8567d15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8567d15 Branch: refs/heads/cassandra-1.0 Commit: f8567d15fee3bf4251e3324f1809edb29cd75645 Parents: 08eebcd Author: Dave Brosius <dbros...@apache.org> Authored: Thu May 2 10:08:44 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu May 2 10:08:44 2013 -0400 ---------------------------------------------------------------------- build.xml | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8567d15/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 57e3ab2..43172c9 100644 --- a/build.xml +++ b/build.xml @@ -60,6 +60,10 @@ <property name="test.unit.src" value="${test.dir}/unit"/> <property name="test.long.src" value="${test.dir}/long"/> <property name="dist.dir" value="${build.dir}/dist"/> + + <property name="source.version" value="1.6"/> + <property name="target.version" value="1.6"/> + <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -650,12 +654,12 @@ <echo message="${ant.project.name}: ${ant.file}"/> <!-- Order matters! --> <javac debug="true" debuglevel="${debuglevel}" - destdir="${build.classes.thrift}" includeantruntime="false"> + destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"> <src path="${interface.thrift.dir}/gen-java"/> <classpath refid="cassandra.classpath"/> </javac> <javac debug="true" debuglevel="${debuglevel}" - destdir="${build.classes.main}" includeantruntime="false"> + destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"> <src path="${build.src.java}"/> <src path="${build.src.gen-java}"/> <classpath refid="cassandra.classpath"/> @@ -941,7 +945,9 @@ <javac debug="true" debuglevel="${debuglevel}" - destdir="${test.classes}"> + destdir="${test.classes}" + source="${source.version}" + target="${target.version}"> <classpath> <path refid="cassandra.classpath"/> <pathelement location="${build.classes.cql}"/>