mirror of https://github.com/apache/cassandra
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:
parent
08eebcdf44
commit
f8567d15fe
12
build.xml
12
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}"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue