--- mysql-connector-java-5.1.36/build.xml.orig 2015-06-19 21:26:19.000000000 +0200
+++ mysql-connector-java-5.1.36/build.xml 2015-07-14 16:50:31.906927259 +0200
@@ -155,7 +155,6 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
</condition>
<!-- The following properties are needed for finding JDK5 and JDK6 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.jdk6" value="/usr/lib/jvm/jdk1.6" />
<!-- 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
@@ -163,7 +162,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
<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" />
@@ -208,10 +207,10 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
</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>
@@ -219,35 +218,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
<!-- Check for required JDKs for compilation. -->
- <target name="-compiler-check" depends="-jdk5-check, -jdk6-check" />
-
-
- <!-- Check for required JDK5 for compilation of JDBC3 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 6 (for JDBC4+ implementation) is also required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default: '/usr/lib/jvm/jdk1.6'.">
- <condition>
- <not>
- <and>
- <equals arg1="${jdk5checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk5.version}" substring="java version "1.5" casesensitive="true" />
- </and>
- </not>
- </condition>
- </fail>
- </target>
+ <target name="-compiler-check" depends="-jdk6-check" />
<!-- Check for required JDK6 for compilation of JDBC4+ implementation. -->
@@ -267,10 +238,7 @@ Java 6 (for JDBC4+ implementation) is al
<fail message="Java 6 (for JDBC4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default: '/usr/lib/jvm/jdk1.6'.">
<condition>
<not>
- <and>
- <equals arg1="${jdk6checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk6.version}" substring="java version "1.6" casesensitive="true" />
- </and>
+ <equals arg1="${jdk6checkexitstatus}" arg2="0" />
</not>
</condition>
</fail>
@@ -332,7 +300,7 @@ Java 6 (for JDBC4+ implementation) is al
<arg value="-version" />
</exec>
- <fail message="Testing Connector/J requires a JVM 1.5 or higher. Set the path to this JVM (JRE or JDK) home with the property 'com.mysql.jdbc.testsuite.jvm'. Default: '${com.mysql.jdbc.jdk5}'.">
+ <fail message="Testing Connector/J requires a JVM 1.5 or higher. Set the path to this JVM (JRE or JDK) home with the property 'com.mysql.jdbc.testsuite.jvm'. Default: '${com.mysql.jdbc.jdk6}'.">
<condition>
<not>
<equals arg1="${jvmcheckexitstatus}" arg2="0" />
@@ -775,37 +743,11 @@ 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" />
-
-
- <!-- Compile JDBC3 implementation. -->
- <target name="-compile-driver-jdbc3" depends="init, -clean-output">
- <echo>Compiling MySQL Connector/J JDBC3 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">
- <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 JDBC4+ implementation. -->
- <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+ <target name="-compile-driver-jdbc4">
<echo>Compiling MySQL Connector/J JDBC4+ implementation with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
@@ -830,7 +772,7 @@ Java 6 (for JDBC4+ implementation) is al
<target name="compile-testsuite"
description="Compiles driver including JDBC3 and JDBC4+ 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.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -838,7 +780,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="testsuite/**" />
@@ -870,7 +812,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- 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.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -878,7 +820,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="com/mysql/jdbc/integration/c3p0/**" />
@@ -889,7 +831,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- 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.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -897,7 +839,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="com/mysql/jdbc/integration/jboss/**" />
@@ -908,7 +850,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- 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.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
@@ -916,7 +858,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="com/mysql/jdbc/log/Log4JLogger.java" />
@@ -1665,7 +1607,7 @@ Java 6 (for JDBC4+ implementation) is al
<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">
@@ -1752,7 +1694,7 @@ Java 6 (for JDBC4+ implementation) is al
<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">