summaryrefslogtreecommitdiff
path: root/pcr/mysql-jdbc/mysql-connector-java-fix_build.patch
blob: c0fc7ff7fa5ad059dbbda1d7ebb2bd6afb12ad1d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
--- mysql-connector-java-5.1.39.orig/build.xml	2016-05-04 06:11:40.000000000 -0500
+++ mysql-connector-java-5.1.39/build.xml	2016-07-17 06:18:25.500065409 -0500
@@ -244,13 +244,6 @@
                 </not>
             </condition>
         </fail>
-        <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'.">
-            <condition>
-                <not>
-                    <available file="${com.mysql.jdbc.extra.libs}/hibernate4" type="dir" />
-                </not>
-            </condition>
-        </fail>
     </target>
 
 
@@ -413,7 +406,7 @@
 
 
     <!-- Prepares files and settings for compiling driver. -->
-    <target name="init" depends="-compiler-check, -init-copy, -init-filter-license, -init-no-crypto">
+    <target name="init" depends="-init-copy, -init-filter-license, -init-no-crypto">
         <!-- The following is needed for source distributions as the classpath can't be dynamically altered, and not having this directory present causes the
              build to fail. -->
         <available file="${com.mysql.jdbc.docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" />
@@ -833,7 +826,7 @@
     <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and 'helpers' for third-party software. -->
     <target name="compile"
             description="Compiles driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and integration 'helpers' for third-party software."
-            depends="init, compile-driver, compile-testsuite, compile-integration" />
+            depends="init, compile-driver, compile-integration" />
 
 
     <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only. -->
@@ -887,8 +880,6 @@
                bootclasspath="${com.mysql.jdbc.jre6.rtjar}"
                source="1.6"
                target="1.6">
-            <include name="**/FabricMultiTenantConnectionProvider.java" />
-            <include name="**/HibernateFabric.java" />
             <include name="**/JDBC4*.java" />
             <exclude name="**/JDBC42*.java" />
             <include name="com/mysql/jdbc/exceptions/jdbc4/*" />