Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -219,7 +219,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
 
 
     <!-- Check for required JDKs for compilation. -->
-    <target name="-compiler-check" depends="-jdk5-check, -jdk6-check" />
+    <target name="-compiler-check" depends="-jdk6-check" />
 
 
     <!-- Check for required JDK5 for compilation of JDBC3 implementation. -->
@@ -756,7 +756,7 @@ Java 6 (for JDBC4+ implementation) is al
     <!-- Compile the driver including JDBC3 and JDBC4+ implementations only. -->
     <target name="compile-driver"
             description="Compiles driver including JDBC3 and JDBC4+ implementations only."
-            depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />
+            depends="-compile-driver-jdbc4" />
 
 
     <!-- Compile JDBC3 implementation. -->
@@ -787,7 +787,7 @@ Java 6 (for JDBC4+ implementation) is al
 
 
     <!-- Compile JDBC4+ implementation. -->
-    <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+    <target name="-compile-driver-jdbc4" depends="init, -clean-output">
         <echo>Compiling MySQL Connector/J JDBC4+ implementation with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
@@ -816,21 +816,6 @@ Java 6 (for JDBC4+ implementation) is al
 
         <javac sourcepath=""
                srcdir="${buildDir}/${fullProdName}"
-               destdir="${compiler.output}"
-               deprecation="off"
-               debug="${debug.enable}"
-               fork="yes"
-               executable="${com.mysql.jdbc.jdk5.javac}"
-               compiler="modern"
-               includeantruntime="false">
-            <include name="testsuite/**" />
-            <exclude name="testsuite/requiresNonRedists/**" />
-            <exclude name="testsuite/**/jdbc4/**" />
-            <classpath refid="project.build.classpath" />
-        </javac>
-
-        <javac sourcepath=""
-               srcdir="${buildDir}/${fullProdName}"
                destdir="${compiler.output}"
                deprecation="off"
                debug="${debug.enable}"