[pkg-java] r17996 - trunk/mysql-connector-java/debian/patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-07 06:35:02 +0000 (Mon, 07 Apr 2014)
New Revision: 17996

Added:
   trunk/mysql-connector-java/debian/patches/0003-disable-hibernate-fabric.patch
Modified:
   trunk/mysql-connector-java/debian/patches/series
Log:
Do not compile MultiTenantConnectionProvider



Added: trunk/mysql-connector-java/debian/patches/0003-disable-hibernate-fabric.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0003-disable-hibernate-fabric.patch	                        (rev 0)
+++ trunk/mysql-connector-java/debian/patches/0003-disable-hibernate-fabric.patch	2014-04-07 06:35:02 UTC (rev 17996)
@@ -0,0 +1,16 @@
+Description: Do not compile MultiTenantConnectionProvider since it requires Hibernate 4 which isn't in Debian yet
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -858,8 +858,10 @@
+ 			compiler="modern"
+ 			sourcepath="" srcdir="${buildDir}/${fullProdName}"
+ 			bootclasspath="${com.mysql.jdbc.java6.rtjar}">
++<!--
+ 			<include name="**/FabricMultiTenantConnectionProvider.java"/>
+ 			<include name="**/HibernateFabric.java"/>
++-->
+ 			<include name="**/JDBC4*.java" />
+ 			<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
+ 

Modified: trunk/mysql-connector-java/debian/patches/series
===================================================================
--- trunk/mysql-connector-java/debian/patches/series	2014-04-07 05:46:37 UTC (rev 17995)
+++ trunk/mysql-connector-java/debian/patches/series	2014-04-07 06:35:02 UTC (rev 17996)
@@ -1,2 +1,3 @@
 0001-disable-testsuite.patch
 0002-java6-compilation-compat.patch
+0003-disable-hibernate-fabric.patch