- Add patch compile-jdk7.patch to compile with old JDK versions

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=38
This commit is contained in:
Tomáš Chvátal 2017-05-18 12:24:26 +00:00 committed by Git OBS Bridge
parent f4baf482ee
commit 64518923b8
3 changed files with 29 additions and 0 deletions

26
compile-jdk7.patch Normal file
View File

@ -0,0 +1,26 @@
Index: mysql-connector-java-5.1.42/build.xml
===================================================================
--- mysql-connector-java-5.1.42.orig/build.xml
+++ mysql-connector-java-5.1.42/build.xml
@@ -911,8 +911,8 @@ Java 8 (for JDBC 4+ implementation) is a
executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false"
- source="1.8"
- target="1.8">
+ source="1.6"
+ target="1.6">
<include name="**/JDBC42*.java" />
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
@@ -970,8 +970,8 @@ Java 8 (for JDBC 4+ implementation) is a
executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern"
includeantruntime="false"
- source="1.8"
- target="1.8">
+ source="1.6"
+ target="1.6">
<include name="testsuite/**/jdbc42/**" />
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />

View File

@ -9,6 +9,7 @@ Thu May 18 11:55:03 UTC 2017 - tchvatal@suse.com
- Drop patch no-jdk5-requirement.patch:
* Simply override the value in ant command
- Add patch hibernate-check.patch to remove hibernate check
- Add patch compile-jdk7.patch to compile with old JDK versions
-------------------------------------------------------------------
Thu May 18 10:42:07 UTC 2017 - tchvatal@suse.com

View File

@ -31,6 +31,7 @@ Patch0: javac-check.patch
Patch1: hibernate-check.patch
Patch2: mysql-connector-java-jdbc-4.1.patch
Patch3: disable-testsuite.patch
Patch4: compile-jdk7.patch
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
@ -67,6 +68,7 @@ set that supports the capabilities of MySQL.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# dup
rm -f README