[mysql-connector-java] 04/05: Add remove-JDBC-4-classes.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch jessie-security
in repository mysql-connector-java.

commit 17e87434bcc9d6fa3ce7aa838db6a5b3e2e9f23a
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jun 22 15:03:12 2016 +0200

    Add remove-JDBC-4-classes.patch
---
 debian/changelog                           |  4 +-
 debian/patches/remove-JDBC-4-classes.patch | 63 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99108ae..7422880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mysql-connector-java (5.1.39-1~deb8u1) jessie-security; urgency=medium
+mysql-connector-java (5.1.39-1~deb8u1) jessie-security; urgency=high
 
   * Team upload.
   * Fix CVE-2015-2575 by backporting the latest stable release.
@@ -12,7 +12,7 @@ mysql-connector-java (5.1.39-1~deb8u1) jessie-security; urgency=medium
   * Relax build-dependency on default-jdk to >= 1.7.
   * Do not build the JDBC 4+ implementation which requires Java 8.
 
- -- Markus Koschany <apo at debian.org>  Tue, 21 Jun 2016 21:48:42 +0200
+ -- Markus Koschany <apo at debian.org>  Wed, 22 Jun 2016 15:02:52 +0200
 
 mysql-connector-java (5.1.39-1) unstable; urgency=medium
 
diff --git a/debian/patches/remove-JDBC-4-classes.patch b/debian/patches/remove-JDBC-4-classes.patch
new file mode 100644
index 0000000..b0edbff
--- /dev/null
+++ b/debian/patches/remove-JDBC-4-classes.patch
@@ -0,0 +1,63 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 22 Jun 2016 15:00:42 +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.
+---
+ build.xml | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 0dc5027..9bf7791 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" />
+             <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" />
+             <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 --git a/debian/patches/series b/debian/patches/series
index 2aab2dc..2e7cf14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-java6-compilation-compat.patch
 0003-disable-hibernate-fabric.patch
 0004-skip-jdk-check.patch
+remove-JDBC-4-classes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git