From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Mon, 28 Apr 2014 21:51:50 +0000 (+0100)
Subject: Switch to Java 6 for building
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=68b0d4a40dd4f0730fd28ee4bcf1104aa49ddbe0;p=jabaws.git

Switch to Java 6 for building
---

diff --git a/build.xml b/build.xml
index c975c2a..5775b82 100644
--- a/build.xml
+++ b/build.xml
@@ -120,27 +120,27 @@
 		<!-- copy files to class path-->
 		<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
 		<!-- Complile the datamodel first -->
-		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the engines -->
-		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the runners -->
-		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the webservices -->
-		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the tests -->
-		<javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.7" source="1.7" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 			<classpath refid="test.classpath" />
@@ -162,23 +162,23 @@
 		<!-- copy files to class path-->
 		<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
 		<!-- Complile the datamodel first -->
-		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the engines -->
-		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:all" />
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the runners -->
-		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the webservices -->
-		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.7" source="1.7" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>