diff -Nru mysql-connector-j-5.1.38/build.xml mysql-connector-j-5.1.38.build/build.xml
--- mysql-connector-j-5.1.38/build.xml	2015-12-02 02:13:22.000000000 +0100
+++ mysql-connector-j-5.1.38.build/build.xml	2015-12-08 09:12:11.344825605 +0100
@@ -166,7 +166,6 @@
     </condition>
 
     <!-- The following properties are needed for finding JDK5 and JDK8 needed for compile and can be passed on the command line to ant via -D switches. -->
-    <property name="com.mysql.jdbc.jdk5" value="/usr/lib/jvm/jdk1.5" />
     <property name="com.mysql.jdbc.jdk8" value="/usr/lib/jvm/jdk1.8" />
 
     <!-- The following property allows to point the location of third-party libraries we don't distribute. Default value points to src/lib so user could either
@@ -174,7 +173,7 @@
     <property name="com.mysql.jdbc.extra.libs" value="${sourceDir}/lib" />
 
     <!-- The following property is needed for finding a JVM to execute the tests and can be passed on the command line to ant via -D switch. -->
-    <property name="com.mysql.jdbc.testsuite.jvm" value="${com.mysql.jdbc.jdk5}" />
+    <property name="com.mysql.jdbc.testsuite.jvm" value="${com.mysql.jdbc.jdk6}" />
 
     <!-- The following property is needed for building the docs and must be passed on the command line to ant via -D switch. -->
     <property name="com.mysql.jdbc.docs.sourceDir" value="/tmp/connectorj/docs/prebuilt" />
@@ -193,8 +192,14 @@
     </path>
 
     <path id="project.build.classpath">
-        <fileset dir="${com.mysql.jdbc.extra.libs}">
-            <include name="**/*.jar" />
+        <fileset dir="/usr/share/java">
+            <include name="hamcrest/all.jar" />
+            <include name="junit.jar" />
+            <include name="commons-logging.jar" />
+            <include name="slf4j/api.jar" />
+            <include name="jta.jar" />
+            <include name="c3p0/c3p0.jar" />
+            <include name="hibernate/hibernate-core.jar" />
         </fileset>
 
         <fileset dir="${buildDir}/${fullProdName}/lib">
@@ -219,10 +224,10 @@
                 </not>
             </condition>
         </fail>
-        <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'.">
+        <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate'.">
             <condition>
                 <not>
-                    <available file="${com.mysql.jdbc.extra.libs}/hibernate4" type="dir" />
+                    <available file="${com.mysql.jdbc.extra.libs}/hibernate" type="dir" />
                 </not>
             </condition>
         </fail>
@@ -230,34 +235,7 @@
 
 
     <!-- Check for required JDKs for compilation. -->
-    <target name="-compiler-check" depends="-jdk5-check, -jdk8-check, -jre6-rtjar-check" />
-
-
-    <!-- Check for required JDK5 for compilation of JDBC 3 implementation. -->
-    <target name="-jdk5-check">
-        <property name="com.mysql.jdbc.jdk5.java" value="${com.mysql.jdbc.jdk5}/bin/java" />
-        <property name="com.mysql.jdbc.jdk5.javac" value="${com.mysql.jdbc.jdk5}/bin/javac" />
-
-        <local name="com.mysql.jdbc.jdk5.version" />
-        <exec executable="${com.mysql.jdbc.jdk5.java}"
-              outputproperty="com.mysql.jdbc.jdk5.version"
-              failonerror="false"
-              failifexecutionfails="false"
-              resultproperty="jdk5checkexitstatus">
-            <arg value="-version" />
-        </exec>
-
-        <fail message="Java 5 is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk5'. Default: '/usr/lib/jvm/jdk1.5').
-Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">
-            <condition>
-                <not>
-                    <and>
-                        <equals arg1="${jdk5checkexitstatus}" arg2="0" />
-                        <contains string="${com.mysql.jdbc.jdk5.version}" substring="java version &quot;1.5" casesensitive="true" />
-                    </and>
-                </not>
-            </condition>
-        </fail>
+    <target name="-compiler-check" depends="-jdk8-check, -jre6-rtjar-check">
     </target>
 
 
@@ -275,13 +253,10 @@
             <arg value="-version" />
         </exec>
 
-        <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">
+        <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '${com.mysql.jdbc.jdk8}'.">
             <condition>
                 <not>
-                    <and>
-                        <equals arg1="${jdk8checkexitstatus}" arg2="0" />
-                        <contains string="${com.mysql.jdbc.jdk8.version}" substring="java version &quot;1.8" casesensitive="true" />
-                    </and>
+                    <equals arg1="${jdk8checkexitstatus}" arg2="0" />
                 </not>
             </condition>
         </fail>
@@ -813,39 +788,10 @@
     <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only. -->
     <target name="compile-driver"
             description="Compiles driver including JDBC 3 and JDBC 4+ implementations only."
-            depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />
-
-
-    <!-- Compile JDBC 3 implementation. -->
-    <target name="-compile-driver-jdbc3" depends="init, -clean-output">
-        <echo>Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
-
-        <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"
-               source="1.5"
-               target="1.5">
-            <include name="**/*.java" />
-            <exclude name="testsuite/**" />
-            <exclude name="com/mysql/jdbc/integration/**" />
-            <exclude name="com/mysql/jdbc/log/Log4JLogger.java" />
-            <exclude name="**/JDBC4*.java" />
-            <exclude name="**/FabricMultiTenantConnectionProvider.java" />
-            <exclude name="**/HibernateFabric.java" />
-            <exclude name="com/mysql/jdbc/exceptions/jdbc4/*" />
-            <classpath refid="project.build.classpath" />
-        </javac>
-    </target>
-
+            depends="-compile-driver-jdbc4" />
 
     <!-- Compile JDBC 4+ implementation. -->
-    <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+    <target name="-compile-driver-jdbc4">
         <echo>Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
@@ -889,7 +835,7 @@
     <target name="compile-testsuite"
             description="Compiles driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite."
             depends="init, compile-driver">
-        <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+        <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
                srcdir="${buildDir}/${fullProdName}"
@@ -897,11 +843,11 @@
                deprecation="off"
                debug="${debug.enable}"
                fork="yes"
-               executable="${com.mysql.jdbc.jdk5.javac}"
+               executable="${com.mysql.jdbc.jdk8.javac}"
                compiler="modern"
                includeantruntime="false"
-               source="1.5"
-               target="1.5">
+               source="1.6"
+               target="1.6">
             <include name="testsuite/**" />
             <exclude name="testsuite/requiresNonRedists/**" />
             <exclude name="testsuite/**/jdbc4*/**" />
@@ -949,7 +895,7 @@
 
     <!-- Compile c3p0 integration. -->
     <target name="-compile-integration-c3p0" depends="compile-driver" if="com.mysql.jdbc.c3p0Present">
-        <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+        <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
                srcdir="${buildDir}/${fullProdName}"
@@ -957,11 +903,11 @@
                deprecation="off"
                debug="${debug.enable}"
                fork="yes"
-               executable="${com.mysql.jdbc.jdk5.javac}"
+               executable="${com.mysql.jdbc.jdk8.javac}"
                compiler="modern"
                includeantruntime="false"
-               source="1.5"
-               target="1.5">
+               source="1.6"
+               target="1.6">
             <include name="com/mysql/jdbc/integration/c3p0/**" />
             <classpath refid="project.build.classpath" />
         </javac>
@@ -970,7 +916,7 @@
 
     <!-- Compile jBoss integration. -->
     <target name="-compile-integration-jboss" depends="compile-driver" if="com.mysql.jdbc.jbossPresent">
-        <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+        <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
                srcdir="${buildDir}/${fullProdName}"
@@ -978,11 +924,11 @@
                deprecation="off"
                debug="${debug.enable}"
                fork="yes"
-               executable="${com.mysql.jdbc.jdk5.javac}"
+               executable="${com.mysql.jdbc.jdk8.javac}"
                compiler="modern"
                includeantruntime="false"
-               source="1.5"
-               target="1.5">
+               source="1.6"
+               target="1.6">
             <include name="com/mysql/jdbc/integration/jboss/**" />
             <classpath refid="project.build.classpath" />
         </javac>
@@ -991,7 +937,7 @@
 
     <!-- Compile Log4j integration. -->
     <target name="-compile-integration-log4j" depends="compile-driver" if="com.mysql.jdbc.log4jPresent">
-        <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>
+        <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>
 
         <javac sourcepath=""
                srcdir="${buildDir}/${fullProdName}"
@@ -999,11 +945,11 @@
                deprecation="off"
                debug="${debug.enable}"
                fork="yes"
-               executable="${com.mysql.jdbc.jdk5.javac}"
+               executable="${com.mysql.jdbc.jdk8.javac}"
                compiler="modern"
                includeantruntime="false"
-               source="1.5"
-               target="1.5">
+               source="1.6"
+               target="1.6">
             <include name="com/mysql/jdbc/log/Log4JLogger.java" />
             <classpath refid="project.build.classpath" />
         </javac>
@@ -1791,7 +1737,7 @@
             <sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />
 
             <classpath>
-                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate4">
+                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate">
                     <include name="**/*.jar" />
                 </fileset>
                 <fileset dir="${buildDir}/${fullProdName}/lib">
@@ -1878,7 +1824,7 @@
             <sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />
 
             <classpath>
-                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate4">
+                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate">
                     <include name="**/*.jar" />
                 </fileset>
                 <fileset dir="src/lib">