[mysql-connector-java] 01/01: Import Debian changes 5.1.42-1~deb7u1
Markus Koschany
apo at moszumanska.debian.org
Wed May 17 18:49:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch wheezy
in repository mysql-connector-java.
commit b6f6bb4f10bfdcb32d81a169790518c7b17b523f
Merge: 42a21fc 15b0228
Author: Markus Koschany <apo at debian.org>
Date: Tue May 16 23:28:37 2017 +0200
Import Debian changes 5.1.42-1~deb7u1
mysql-connector-java (5.1.42-1~deb7u1) wheezy-security; urgency=high
* Team upload.
* Backport upstream version 5.1.42 which fixes CVE-2017-3589, CVE-2017-3586,
CVE-2017-3523.
mysql-connector-java (5.1.42-1) unstable; urgency=medium
* Team upload.
* New upstream release
- Fixes CVE-2017-3586 and CVE-2017-3589
- Refreshed the patches
mysql-connector-java (5.1.41-1) unstable; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
mysql-connector-java (5.1.40-1) unstable; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
* Build with the DH sequencer instead of CDBS
* Switch to debhelper level 10
mysql-connector-java (5.1.39-1) unstable; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
* Standards-Version updated to 3.9.8 (no changes)
* Use a secure Vcs-Git URL
CHANGES | 101 +-
README | 4 +-
README.txt | 4 +-
build.xml | 80 +-
debian/changelog | 47 +-
debian/control | 2 +-
debian/patches/0001-disable-testsuite.patch | 2 +-
debian/patches/0002-java6-compilation-compat.patch | 20 +-
debian/patches/0003-disable-hibernate-fabric.patch | 2 +-
debian/patches/remove-JDBC-4-classes.patch | 28 +-
debian/patches/series | 1 -
debian/patches/wheezy-ftbfs.patch | 27 -
debian/rules | 39 +-
src/com/mysql/fabric/FabricConnection.java | 31 +-
src/com/mysql/fabric/FabricStateResponse.java | 17 +-
src/com/mysql/fabric/HashShardMapping.java | 7 +-
.../FabricMultiTenantConnectionProvider.java | 8 +-
.../fabric/jdbc/FabricMySQLConnectionProxy.java | 140 ++-
.../mysql/fabric/proto/xmlrpc/XmlRpcClient.java | 11 +-
.../jdbc/AbandonedConnectionCleanupThread.java | 114 ++-
src/com/mysql/jdbc/CallableStatement.java | 23 +-
src/com/mysql/jdbc/CharsetMapping.java | 205 ++--
src/com/mysql/jdbc/CompressedInputStream.java | 35 +-
src/com/mysql/jdbc/ConnectionImpl.java | 373 ++++----
src/com/mysql/jdbc/ConnectionPropertiesImpl.java | 18 +-
src/com/mysql/jdbc/DatabaseMetaData.java | 72 +-
src/com/mysql/jdbc/ExportControlled.java | 161 +++-
src/com/mysql/jdbc/Field.java | 28 +-
src/com/mysql/jdbc/JDBC42ResultSet.java | 19 +-
src/com/mysql/jdbc/JDBC42UpdatableResultSet.java | 64 +-
src/com/mysql/jdbc/JDBC4UpdatableResultSet.java | 96 +-
.../mysql/jdbc/LocalizedErrorMessages.properties | 9 +-
src/com/mysql/jdbc/MultiHostMySQLConnection.java | 4 +-
src/com/mysql/jdbc/MySQLConnection.java | 4 +-
src/com/mysql/jdbc/MysqlDefs.java | 23 +-
src/com/mysql/jdbc/MysqlIO.java | 39 +-
src/com/mysql/jdbc/NonRegisteringDriver.java | 10 +-
src/com/mysql/jdbc/PreparedStatement.java | 58 +-
src/com/mysql/jdbc/ReplicationConnectionGroup.java | 6 +-
src/com/mysql/jdbc/ReplicationConnectionProxy.java | 5 +
src/com/mysql/jdbc/ReplicationMySQLConnection.java | 4 +-
src/com/mysql/jdbc/ResultSetImpl.java | 338 +++----
src/com/mysql/jdbc/SQLError.java | 15 +-
src/com/mysql/jdbc/ServerPreparedStatement.java | 17 +-
src/com/mysql/jdbc/StatementImpl.java | 112 ++-
src/com/mysql/jdbc/StringUtils.java | 298 +++---
src/com/mysql/jdbc/UpdatableResultSet.java | 1006 ++++++++++----------
src/com/mysql/jdbc/Util.java | 46 +-
.../mysql/jdbc/jdbc2/optional/MysqlDataSource.java | 8 +-
.../jdbc/jdbc2/optional/MysqlXAConnection.java | 18 +-
src/com/mysql/jdbc/jdbc2/optional/WrapperBase.java | 5 +-
src/com/mysql/jdbc/log/LogFactory.java | 5 +-
src/demo/fabric/EmployeesDataSource.java | 10 +-
src/testsuite/BaseTestCase.java | 32 +-
src/testsuite/fabric/TestShardMapping.java | 72 +-
src/testsuite/fabric/jdbc/TestBasicConnection.java | 46 -
src/testsuite/fabric/jdbc/TestRegressions.java | 171 ++++
.../CallableStatementRegressionTest.java | 141 ++-
.../regression/CharsetRegressionTest.java | 17 +-
.../regression/ConnectionRegressionTest.java | 245 ++++-
.../regression/DataSourceRegressionTest.java | 14 +
.../regression/MetaDataRegressionTest.java | 86 +-
.../regression/ResultSetRegressionTest.java | 428 ++++++++-
.../regression/StatementRegressionTest.java | 473 ++++++++-
src/testsuite/regression/SyntaxRegressionTest.java | 836 +++++++++++++++-
src/testsuite/regression/UtilsRegressionTest.java | 64 +-
.../regression/jdbc4/ConnectionRegressionTest.java | 9 +-
.../regression/jdbc4/MetaDataRegressionTest.java | 141 ++-
.../jdbc42/ConnectionRegressionTest.java | 93 ++
.../regression/jdbc42/ResultSetRegressionTest.java | 75 ++
src/testsuite/simple/CharsetTest.java | 14 +-
src/testsuite/simple/ConnectionTest.java | 191 +++-
src/testsuite/simple/ResultSetTest.java | 10 +-
src/testsuite/simple/StringUtilsTest.java | 351 ++++++-
src/testsuite/simple/UtilsTest.java | 11 +-
src/testsuite/ssl-test-certs/ca-cert.pem | 45 +-
src/testsuite/ssl-test-certs/ca-key.pem | 50 +-
src/testsuite/ssl-test-certs/ca-truststore | Bin 0 -> 1109 bytes
src/testsuite/ssl-test-certs/certs_howto.txt | 122 +++
src/testsuite/ssl-test-certs/client-cert.pem | 22 +
src/testsuite/ssl-test-certs/client-key.pem | 27 +
src/testsuite/ssl-test-certs/client-keystore | Bin 0 -> 2308 bytes
src/testsuite/ssl-test-certs/server-cert.pem | 39 +-
src/testsuite/ssl-test-certs/server-key.pem | 50 +-
src/testsuite/ssl-test-certs/server-req.pem | 17 -
src/testsuite/ssl-test-certs/test-cert-store | Bin 1158 -> 0 bytes
86 files changed, 5756 insertions(+), 1955 deletions(-)
diff --cc debian/changelog
index be8ad51,0000000..61b3912
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,310 -1,0 +1,327 @@@
- mysql-connector-java (5.1.39-1~deb7u1) wheezy-security; urgency=high
++mysql-connector-java (5.1.42-1~deb7u1) wheezy-security; urgency=high
+
+ * Team upload.
- * Fix CVE-2015-2575 by backporting the latest stable release.
- Vulnerability in the MySQL Connectors component of Oracle MySQL
- (subcomponent: Connector/J). Supported versions that are affected are
- 5.1.34 and earlier. Difficult to exploit vulnerability allows successful
- authenticated network attacks via multiple protocols. Successful attack of
- this vulnerability can result in unauthorized update, insert or delete
- access to some MySQL Connectors accessible data as well as read access to a
- subset of MySQL Connectors accessible data.
- * Relax build-dependency on default-jdk.
- * Do not build the JDBC 4+ implementation which requires Java 8.
- * Add wheezy-ftbfs.patch and work around a FTBFS that occurs in Wheezy due to
- non-existent method.
-
- -- Markus Koschany <apo at debian.org> Sat, 25 Jun 2016 16:48:11 +0200
++ * Backport upstream version 5.1.42 which fixes CVE-2017-3589, CVE-2017-3586,
++ CVE-2017-3523.
++
++ -- Markus Koschany <apo at debian.org> Tue, 16 May 2017 23:28:37 +0200
++
++mysql-connector-java (5.1.42-1) unstable; urgency=medium
++
++ * Team upload.
++ * New upstream release
++ - Fixes CVE-2017-3586 and CVE-2017-3589
++ - Refreshed the patches
++
++ -- Emmanuel Bourg <ebourg at apache.org> Mon, 08 May 2017 00:12:30 +0200
++
++mysql-connector-java (5.1.41-1) unstable; urgency=medium
++
++ * Team upload.
++ * New upstream release
++ - Refreshed the patches
++
++ -- Emmanuel Bourg <ebourg at apache.org> Wed, 15 Mar 2017 23:23:36 +0100
++
++mysql-connector-java (5.1.40-1) unstable; urgency=medium
++
++ * Team upload.
++ * New upstream release
++ - Refreshed the patches
++ * Build with the DH sequencer instead of CDBS
++ * Switch to debhelper level 10
++
++ -- Emmanuel Bourg <ebourg at apache.org> Sun, 30 Oct 2016 22:22:49 +0100
+
+mysql-connector-java (5.1.39-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+ * Standards-Version updated to 3.9.8 (no changes)
+ * Use a secure Vcs-Git URL
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 20 Jun 2016 18:03:15 +0200
+
+mysql-connector-java (5.1.38-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 11 Dec 2015 00:00:32 +0100
+
+mysql-connector-java (5.1.37-1) experimental; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ - Build depend on Java 8
+ * Standards-Version updated to 3.9.6 (no changes)
+ * Updated the package description
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 27 Oct 2015 10:00:36 +0100
+
+mysql-connector-java (5.1.32-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+ * Forced the build file to accept any JDK
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 22 Aug 2014 00:37:28 +0200
+
+mysql-connector-java (5.1.31-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+ * Moved the package to Git
+ * Create the src/lib directory before building since empty directories
+ are dropped by Git
+ * Suggest libslf4j-java instead of liblog4j1.2-java, libcommons-logging-java
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 10 Jun 2014 12:44:23 +0200
+
+mysql-connector-java (5.1.30-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+ * Do not compile MultiTenantConnectionProvider since it requires Hibernate 4
+ which isn't in Debian yet
+ * debian/rules: Feed the com.mysql.jdbc.extra.libs property to Ant and create
+ a fake lib directory to pass the validation performed by build.xml
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 07 Apr 2014 08:38:12 +0200
+
+mysql-connector-java (5.1.29-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+ * Check the upstream GPG signature
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 08 Feb 2014 17:15:13 +0100
+
+mysql-connector-java (5.1.28-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 31 Dec 2013 22:02:44 +0100
+
+mysql-connector-java (5.1.27-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed the patches
+ * Updated Standards-Version to 3.9.5 (no changes)
+ * Use XZ compression for the upstream tarball
+ * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 06 Nov 2013 23:49:02 +0100
+
+mysql-connector-java (5.1.26-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed the patches
+ * Generate Java 6 compatible bytecode
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 09 Aug 2013 14:47:12 +0200
+
+mysql-connector-java (5.1.25-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed the patches
+ * Added a patch to build with one JDK and removed the build
+ dependency on java-gcj-compat-dev
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Improved the clean target to allow rebuilds
+ * Updated the watch file
+ * Renamed debian/README.Debian-source to README.source
+
+ [ Miguel Landaeta ]
+ * Fix FTBFS with OpenJDK 7 (Closes: #706668)
+ * Remove Michael Koch from Uploaders list.
+ Thanks for your work on this package. (Closes: #654122).
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 02 Jul 2013 17:07:51 +0200
+
+mysql-connector-java (5.1.16-2) unstable; urgency=low
+
+ * Team upload.
+ * Switch to default-jdk (Closes: #640619)
+
+ -- Torsten Werner <twerner at debian.org> Tue, 06 Sep 2011 21:28:09 +0200
+
+mysql-connector-java (5.1.16-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Miguel Telleria de Esteban ]
+ * Add mh_installpoms to give maven support for other packages using
+ mysql-java. (Closes: #627746)
+
+ [ Torsten Werner ]
+ * New upstream release. Switch from commons logging to slf4j.
+ * Clean up orig tarball even more. Remove c3p0*.zip and documentation without
+ source format.
+ * Add target get-orig-source to debian/rules.
+ * Remove Arnaud from Uploaders list.
+ * Remove Java runtime from Depends.
+ * Switch to source format 3.0.
+ * Switch to debhelper level 7.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 25 Aug 2011 11:09:59 +0200
+
+mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low
+
+ * Fix installation of versioned jar (Closes: #549677).
+
+ -- Michael Koch <konqueror at gmx.de> Mon, 05 Oct 2009 20:18:40 +0200
+
+mysql-connector-java (5.1.10+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build-Depends on cdbs.
+ * Made java-gcj-compat-dev a Build-Depends instead of
+ a Build-Depends-Indep.
+ * Build-Depends-Indep on openjdk-6-jdk for JDBC 4.
+ * Build-Depends on debhelper >= 7.
+ * Moved package to section 'java'.
+ * Let package Depends on default-jre-headless and alternatives.
+ * Add Depends ${misc:Depends} to libmysql-java.
+ * Fixed watch file to use a decent FTP mirror.
+ * Added automatic orig tarball creation on upstream updates.
+ * Updated Standards-Version to 3.8.3.
+ * In debian/rules always use JAVA_HOME when possible.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 26 Sep 2009 11:22:43 +0200
+
+mysql-connector-java (5.1.6+dfsg-1) unstable; urgency=low
+
+ * New upstream release. Thanks to Eric Jensen for the hint.
+ * Added watch file.
+ * Updated Standards-Version to 3.7.3.
+ * Fixed Homepage, Vcs-Svn and Vcs-Browser fields.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 02 Apr 2008 10:36:05 +0200
+
+mysql-connector-java (5.1.5+dfsg-2) unstable; urgency=low
+
+ * Disable JDBC4 support. Closes: #454081.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 04 Dec 2007 01:03:48 +0100
+
+mysql-connector-java (5.1.5+dfsg-1) unstable; urgency=low
+
+ * New upstream release. Closes: #450718.
+ * Add Homepage field to debian/control.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 30 Nov 2007 10:34:13 +0100
+
+mysql-connector-java (5.0.4+dfsg-3) unstable; urgency=low
+
+ * Delete build-stamp in clean target. Closes: #424589.
+ * Removed Wolfgang and added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 15 Jul 2007 23:12:02 +0200
+
+mysql-connector-java (5.0.4+dfsg-2) unstable; urgency=low
+
+ * Corrected the symlink `/usr/share/java/mysql.jar'. Thanks to Javier
+ Kohen. (Closes: #404858)
+
+ -- Marcus Better <marcus at better.se> Fri, 29 Dec 2006 13:29:04 +0100
+
+mysql-connector-java (5.0.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #404153, #366808, #394878)
+ - Supports MySQL 5. (Closes: #369379)
+ - Fixes a character set mapping problem. (Closes: #387382)
+ * debian/rules: Get rid of cdbs. Install `CHANGES' file in proper place.
+ * The jar file is now named `mysql-connector-java.jar' instead of
+ `mysql.jar'. Symlinks are provided for the old names for the time
+ being.
+ * debian/control:
+ - Replace Build-Depends-Indep by Build-Depends.
+ - Add missing dependency on ant-optional.
+ - Add XS-Vcs-* fields.
+ * debian/rules: Build with java-gcj-compat-dev instead of Kaffe.
+ * Removed README.Debian since the information on supported JDK versions
+ may be outdated.
+
+ -- Marcus Better <marcus at better.se> Fri, 22 Dec 2006 10:45:42 +0100
+
+mysql-connector-java (3.1.11-1) unstable; urgency=low
+
+ * New upstream release (closes: #338399)
+ * Removed Takashi from uploaders
+ * Removed setting of DEB_ANT_COMPILER variable as already preset in kaffe
+ * Updated build.xml patch once more to changed upstream build behaviour
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 29 Nov 2005 14:07:49 +0100
+
+mysql-connector-java (3.1.10-1) unstable; urgency=low
+
+ * New upstream release
+ + Source structure changed - adapting package build to new structure
+ + Updated README.Debian-source how its repackaged
+ * libant1.6-java to ant transition
+ * Standards-Version 3.6.2 (no changes)
+ * Removed documentation as its explicitly marked as NOT GNU licensed.
+
+ * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 11 Sep 2005 15:35:23 +0200
+
+mysql-connector-java (3.1.7-2) unstable; urgency=low
+
+ * Move to main
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 19 Apr 2005 20:28:25 +0200
+
+mysql-connector-java (3.1.7-1) unstable; urgency=low
+
+ * New upstream release (closes: #282570,#293995)
+ * Now implements JDBC 3 specification - Updated README.Debian/Descriptions
+ * Built with free tools - but stay in contrib to get it into
+ sarge asap (old release does not support mysql 4.1 features)
+ Upload to main will follow afterwards
+ * Changed build system to cdbs: build depends now on kaffe, libant1.6-java,
+ liblog4j1.2-java, junit; Added liblog4j1.2-java as Suggests
+ * No more build depends on jars under /usr/local (closes: #262291)
+ * Patched build.xml (01_BuildXml.patch):
+ - Changed build directory property to a directory inside source tree
+ - Excluded test from testsuite which build depends on
+ sun internal stuff (AppletRegressionTest.java)
+ - Patched javac target to use target=1.3 so it is also usable with
+ JDK 1.3, -Xverify:none needs to be passed to the vm (see README.Debian)
+ * Standards-Version: 3.6.1 - no changes required
+ * Changed maintainer to Debian Java Maintainers as
+ requested by Takashi Okamoto for comaintaining
+ * avdyk: added Wolfgang and myself to the uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sat, 02 Apr 2005 20:30:09 +0200
+
+mysql-connector-java (3.0.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org> Tue, 30 Dec 2003 22:37:53 +0900
+
+mysql-connector-java (3.0.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org> Mon, 26 May 2003 10:42:20 +0900
+
+mysql-connector-java (3.0.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org> Sun, 23 Feb 2003 21:38:54 +0900
+
+mysql-connector-java (2.0.14-1) unstable; urgency=low
+
+ * Initial Release.
+ * close RFP (closes: #104765)
+
+ -- Takashi Okamoto <tora at debian.org> Sun, 10 Nov 2002 10:29:30 +0900
diff --cc debian/control
index 088ca0f,0000000..56a8fdc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,21 @@@
+Source: mysql-connector-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Marcus Better <marcus at better.se>, Emmanuel Bourg <ebourg at apache.org>
- Build-Depends: debhelper (>= 9), cdbs, ant, ant-optional
++Build-Depends: debhelper (>= 9), ant, ant-optional
+Build-Depends-Indep: default-jdk, junit, ant-contrib, maven-repo-helper, libslf4j-java
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/mysql-connector-java.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mysql-connector-java.git
+Homepage: http://www.mysql.com/products/connector/j/
+
+Package: libmysql-java
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libslf4j-java
+Description: Java database (JDBC) driver for MySQL
+ MySQL Connector/J is a JDBC-4.2 Type 4 driver, which means that it is
+ pure Java, implements version 4.2 of the JDBC specification, and
+ communicates directly with the MySQL server using the MySQL
+ protocol.
diff --cc debian/patches/0001-disable-testsuite.patch
index 9015e7b,0000000..3f8c393
mode 100644,000000..100644
--- a/debian/patches/0001-disable-testsuite.patch
+++ b/debian/patches/0001-disable-testsuite.patch
@@@ -1,19 -1,0 +1,19 @@@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 25 Aug 2011 10:44:00 +0200
+Subject: [PATCH] disable testsuite
+
+---
+ build.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/build.xml
++++ b/build.xml
- @@ -833,7 +833,7 @@
++@@ -835,7 +835,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. -->
diff --cc debian/patches/0002-java6-compilation-compat.patch
index 70f8aee,0000000..04c65ba
mode 100644,000000..100644
--- a/debian/patches/0002-java6-compilation-compat.patch
+++ b/debian/patches/0002-java6-compilation-compat.patch
@@@ -1,930 -1,0 +1,930 @@@
+From 3186d1ff965c608171d34903d6c0b8c91a866c43 Mon Sep 17 00:00:00 2001
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Tue, 27 Oct 2015 11:35:57 +0100
+Subject: [PATCH] Java 8 compatibility
+
+---
+ .../fabric/jdbc/FabricMySQLConnectionProxy.java | 32 ++++
+ src/com/mysql/fabric/jdbc/FabricMySQLDriver.java | 4 +-
+ src/com/mysql/jdbc/CallableStatement.java | 84 +++++++++
+ src/com/mysql/jdbc/ConnectionImpl.java | 52 ++++++
+ src/com/mysql/jdbc/DatabaseMetaData.java | 16 ++
+ src/com/mysql/jdbc/MultiHostMySQLConnection.java | 52 ++++++
+ src/com/mysql/jdbc/NonRegisteringDriver.java | 5 +
+ src/com/mysql/jdbc/PreparedStatement.java | 12 ++
+ src/com/mysql/jdbc/ReplicationConnection.java | 52 ++++++
+ src/com/mysql/jdbc/ResultSetImpl.java | 196 +++++++++++++++++++++
+ .../jdbc2/optional/CallableStatementWrapper.java | 136 ++++++++++++++
+ .../jdbc/jdbc2/optional/ConnectionWrapper.java | 52 ++++++
+ .../mysql/jdbc/jdbc2/optional/MysqlDataSource.java | 12 ++
+ .../jdbc/jdbc2/optional/MysqlPooledConnection.java | 11 ++
+ .../jdbc2/optional/PreparedStatementWrapper.java | 72 ++++++++
+ .../jdbc/jdbc2/optional/StatementWrapper.java | 28 +++
+ .../jdbc2/optional/SuspendableXAConnection.java | 8 +
+ 17 files changed, 822 insertions(+), 2 deletions(-)
+
+--- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
++++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
- @@ -3069,4 +3069,36 @@
++@@ -3065,4 +3065,36 @@
+
+ public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
+ }
++
++ public java.sql.Clob createClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Blob createBlob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob createNClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML createSQLXML() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
++++ b/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
+@@ -103,7 +103,7 @@
+ return super.parseURL(url.replaceAll("fabric:", ""), defaults);
+ }
+
+- public Logger getParentLogger() throws SQLException {
+- throw new SQLException("no logging");
++ public Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException("no logging");
+ }
+ }
+--- a/src/com/mysql/jdbc/CallableStatement.java
++++ b/src/com/mysql/jdbc/CallableStatement.java
- @@ -2383,6 +2383,90 @@
++@@ -2396,6 +2396,90 @@
+ }
+ }
+
++ public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.RowId getRowId(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNString(String parameterName, String value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getNCharacterStream(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getCharacterStream(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getCharacterStream(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ /**
+ * JDBC 4.2
+ */
+--- a/src/com/mysql/jdbc/ConnectionImpl.java
++++ b/src/com/mysql/jdbc/ConnectionImpl.java
- @@ -5550,4 +5550,56 @@
- public void setProfilerEventHandlerInstance(ProfilerEventHandler h) {
- this.eventSink = h;
++@@ -5507,4 +5507,56 @@
++ }
++ }
+ }
++
++ public java.sql.Clob createClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Blob createBlob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob createNClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML createSQLXML() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/jdbc/DatabaseMetaData.java
++++ b/src/com/mysql/jdbc/DatabaseMetaData.java
- @@ -7892,6 +7892,22 @@
++@@ -7878,6 +7878,22 @@
+ return pStmt;
+ }
+
++ public java.sql.RowIdLifetime getRowIdLifetime() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ /**
+ * JDBC-4.1
+ *
+--- a/src/com/mysql/jdbc/MultiHostMySQLConnection.java
++++ b/src/com/mysql/jdbc/MultiHostMySQLConnection.java
+@@ -2482,4 +2482,56 @@
+ public boolean isUseSSLExplicit() {
+ return getActiveMySQLConnection().isUseSSLExplicit();
+ }
++
++ public java.sql.Clob createClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Blob createBlob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob createNClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML createSQLXML() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/jdbc/NonRegisteringDriver.java
++++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
- @@ -906,4 +906,9 @@
++@@ -908,4 +908,9 @@
+ }
+ }
+ }
++
++ @Override
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/com/mysql/jdbc/PreparedStatement.java
++++ b/src/com/mysql/jdbc/PreparedStatement.java
- @@ -5090,6 +5090,18 @@
++@@ -5096,6 +5096,18 @@
+ && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1;
+ }
+
++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ /**
+ * JDBC 4.2
+ * Same as PreparedStatement.executeUpdate() but returns long instead of int.
+--- a/src/com/mysql/jdbc/ResultSetImpl.java
++++ b/src/com/mysql/jdbc/ResultSetImpl.java
- @@ -7918,4 +7918,200 @@
++@@ -7890,4 +7890,200 @@
+ protected ExceptionInterceptor getExceptionInterceptor() {
+ return this.exceptionInterceptor;
+ }
++
++ public java.sql.RowId getRowId(int columnIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.RowId getRowId(String columnLabel) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public int getHoldability() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNString(int columnIndex, String nString) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNString(String columnLabel, String nString) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(int columnIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(String columnLabel) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(int columnIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(String columnLabel) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateClob(int columnIndex, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateClob(String columnLabel, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(int columnIndex, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void updateNClob(String columnLabel, java.io.Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
+@@ -1498,6 +1498,142 @@
+
+ return null;
+ }
++
++ public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.RowId getRowId(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNString(String parameterName, String value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob getNClob(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getNString(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getNCharacterStream(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getCharacterStream(int parameterIndex) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Reader getCharacterStream(String parameterName) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBlob(String parameterName, Blob x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClob(String parameterName, Clob x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClob(String parameterName, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(String parameterName, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ //
+ // public Reader getCharacterStream(int parameterIndex) throws SQLException {
+ // try {
+--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
+@@ -2885,4 +2885,56 @@
+ public boolean isUseSSLExplicit() {
+ return this.mc.isUseSSLExplicit();
+ }
++
++ public java.sql.Clob createClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Blob createBlob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob createNClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML createSQLXML() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
- @@ -429,4 +429,16 @@
++@@ -435,4 +435,16 @@
+ // public <T> T unwrap(Class<T> iface) throws SQLException {
+ // throw SQLError.createSQLFeatureNotSupportedException();
+ // }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
+@@ -33,6 +33,7 @@
+ import javax.sql.ConnectionEvent;
+ import javax.sql.ConnectionEventListener;
+ import javax.sql.PooledConnection;
++import javax.sql.StatementEventListener;
+
+ import com.mysql.jdbc.ExceptionInterceptor;
+ import com.mysql.jdbc.SQLError;
+@@ -230,4 +231,14 @@
+ protected ExceptionInterceptor getExceptionInterceptor() {
+ return this.exceptionInterceptor;
+ }
++
++ @Override
++ public void addStatementEventListener(javax.sql.StatementEventListener listener) {
++ throw new UnsupportedOperationException();
++ }
++
++ @Override
++ public void removeStatementEventListener(javax.sql.StatementEventListener listener) {
++ throw new UnsupportedOperationException();
++ }
+ }
+\ No newline at end of file
+--- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
+@@ -567,6 +567,78 @@
+ return buf.toString();
+ }
+
++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNString(int parameterIndex, String value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ //
+ // public void setAsciiStream(int parameterIndex, InputStream x)
+ // throws SQLException {
+--- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
+@@ -581,6 +581,34 @@
+ }
+ }
+
++ public void closeOnCompletion() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isClosed() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setPoolable(boolean poolable) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isPoolable() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ /**
+ * JDBC 4.2
+ * Same as {@link #executeBatch()} but returns long[] instead of int[].
+--- a/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java
+@@ -199,4 +199,12 @@
+ this.currentXAConnection.close();
+ }
+ }
++
++ public void addStatementEventListener(javax.sql.StatementEventListener listener) {
++ throw new UnsupportedOperationException();
++ }
++
++ public void removeStatementEventListener(javax.sql.StatementEventListener listener) {
++ throw new UnsupportedOperationException();
++ }
+ }
diff --cc debian/patches/0003-disable-hibernate-fabric.patch
index 130355b,0000000..3d01023
mode 100644,000000..100644
--- a/debian/patches/0003-disable-hibernate-fabric.patch
+++ b/debian/patches/0003-disable-hibernate-fabric.patch
@@@ -1,32 -1,0 +1,32 @@@
+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
+@@ -244,6 +244,7 @@
+ </not>
+ </condition>
+ </fail>
++<!--
+ <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'.">
+ <condition>
+ <not>
+@@ -251,6 +252,7 @@
+ </not>
+ </condition>
+ </fail>
++-->
+ </target>
+
+
- @@ -887,8 +889,10 @@
++@@ -889,8 +891,10 @@
+ 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/*" />
diff --cc debian/patches/remove-JDBC-4-classes.patch
index b0edbff,0000000..d93a51f
mode 100644,000000..100644
--- a/debian/patches/remove-JDBC-4-classes.patch
+++ b/debian/patches/remove-JDBC-4-classes.patch
@@@ -1,63 -1,0 +1,57 @@@
+From: Markus Koschany <apo at debian.org>
- Date: Wed, 22 Jun 2016 15:00:42 +0200
- Subject: remove JDBC 4+ classes
++Date: Tue, 16 May 2017 14:44:34 +0200
++Subject: remove-JDBC-4-classes
+
- Java 8 is not available in Debian's stable and oldstable distributions.
- Do not compile JDBC 4+ classes that require it.
++Java 8 is not available in Wheezy.
+---
- build.xml | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
++ build.xml | 30 ------------------------------
++ 1 file changed, 30 deletions(-)
+
+diff --git a/build.xml b/build.xml
- index 0dc5027..9bf7791 100644
++index f44f01d..ad3b0d7 100644
+--- a/build.xml
++++ b/build.xml
- @@ -899,25 +899,8 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
- <classpath refid="project.build.classpath" />
++@@ -902,21 +902,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
+ <compilerarg line="${javac.compilerarg}" />
+ </javac>
- -
++
+- <javac sourcepath=""
+- srcdir="${buildDir}/${fullProdName}"
+- destdir="${compiler.output}"
+- deprecation="off"
+- debug="${debug.enable}"
+- fork="yes"
+- executable="${com.mysql.jdbc.jdk8.javac}"
+- compiler="modern"
+- includeantruntime="false"
+- source="1.8"
+- target="1.8">
+- <include name="**/JDBC42*.java" />
+- <classpath refid="project.build.classpath" />
+- <compilerarg line="${javac.compilerarg}" />
+- </javac>
+ </target>
+
- -
- <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite. -->
- <target name="compile-testsuite"
- description="Compiles driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite."
- @@ -958,22 +941,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
- <classpath refid="project.build.classpath" />
++
++@@ -961,21 +946,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
+ <compilerarg line="${javac.compilerarg}" />
+ </javac>
- -
++
+- <javac sourcepath=""
+- srcdir="${buildDir}/${fullProdName}"
+- destdir="${compiler.output}"
+- deprecation="off"
+- debug="${debug.enable}"
+- fork="yes"
+- executable="${com.mysql.jdbc.jdk8.javac}"
+- compiler="modern"
+- includeantruntime="false"
+- source="1.8"
+- target="1.8">
+- <include name="testsuite/**/jdbc42/**" />
+- <classpath refid="project.build.classpath" />
+- <compilerarg line="${javac.compilerarg}" />
+- </javac>
+ </target>
+
+
diff --cc debian/patches/series
index b36e657,0000000..2e7cf14
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,5 @@@
+0001-disable-testsuite.patch
+0002-java6-compilation-compat.patch
+0003-disable-hibernate-fabric.patch
+0004-skip-jdk-check.patch
+remove-JDBC-4-classes.patch
- wheezy-ftbfs.patch
diff --cc debian/rules
index 22f4b02,0000000..40fc1d5
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,39 -1,0 +1,40 @@@
+#!/usr/bin/make -f
+
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/ant.mk
-
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
- DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
- DEB_ANT_ARGS := \
- -Dcom.mysql.jdbc.jdk5.javac=$(JAVA_HOME)/bin/javac \
- -Dcom.mysql.jdbc.jdk8.javac=$(JAVA_HOME)/bin/javac \
- -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/jre/lib/rt.jar \
- -Dsnapshot.version= \
- -Dcom.mysql.jdbc.extra.libs=lib \
- -Dant.java.version=1.5 \
- -Dant.build.javac.source=1.6 \
- -Dant.build.javac.target=1.6
-
- pre-build::
++%:
++ dh $@
++
++override_dh_auto_build:
+ mkdir -p lib
+ mkdir -p src/lib
+ ln -f -s /usr/share/java/ant-contrib.jar lib/ant-contrib.jar
- ln -f -s /usr/share/java/slf4j-api.jar lib/slf4j-api.jar
++ ln -f -s /usr/share/java/slf4j-api.jar lib/slf4j-api.jar
++
++ dh_auto_build -- \
++ -Dcom.mysql.jdbc.jdk5.javac=$(JAVA_HOME)/bin/javac \
++ -Dcom.mysql.jdbc.jdk8.javac=$(JAVA_HOME)/bin/javac \
++ -Dsnapshot.version= \
++ -Dcom.mysql.jdbc.extra.libs=lib \
++ -Dant.java.version=1.5 \
++ -Dant.build.javac.source=1.6 \
++ -Dant.build.javac.target=1.6
++
++override_dh_install:
++ dh_install
+
- binary-post-install/libmysql-java::
+ mh_installpoms -plibmysql-java -e$(VERSION)
+ mh_installjar -plibmysql-java -e$(VERSION) -l src/doc/sources/pom.xml build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar
+ # compat link?
+ dh_link -plibmysql-java usr/share/java/mysql-connector-java.jar usr/share/java/mysql.jar
+
- clean::
++override_dh_clean:
++ dh_clean
+ rm -rf dist lib
+ rm -f build-stamp
+ mh_clean
+
+get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
++ uscan --download-current-version --force-download --no-symlink
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git
More information about the pkg-java-commits
mailing list