natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

explicitly set java source and target to 1.6 for the ant tasks 

patch by dbrosius reviewed by slebresne for CASSANDRA-5533
This commit is contained in:
Dave Brosius 2013-05-02 10:08:44 -04:00
parent 08eebcdf44
commit f8567d15fe
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.xml
View File

@ -60,6 +60,10 @@
<property name="test.unit.src" value="${test.dir}/unit"/> <property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/> <property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/> <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}"> <condition property="version" value="${base.version}">
<isset property="release"/> <isset property="release"/>
</condition> </condition>
@ -650,12 +654,12 @@
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! --> <!-- Order matters! -->
<javac debug="true" debuglevel="${debuglevel}" <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"/> <src path="${interface.thrift.dir}/gen-java"/>
<classpath refid="cassandra.classpath"/> <classpath refid="cassandra.classpath"/>
</javac> </javac>
<javac debug="true" debuglevel="${debuglevel}" <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.java}"/>
<src path="${build.src.gen-java}"/> <src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/> <classpath refid="cassandra.classpath"/>
@ -941,7 +945,9 @@
<javac <javac
debug="true" debug="true"
debuglevel="${debuglevel}" debuglevel="${debuglevel}"
destdir="${test.classes}"> destdir="${test.classes}"
source="${source.version}"
target="${target.version}">
<classpath> <classpath>
<path refid="cassandra.classpath"/> <path refid="cassandra.classpath"/>
<pathelement location="${build.classes.cql}"/> <pathelement location="${build.classes.cql}"/>