94b1cd0d11
- Refresh patch extra-libs-build.patch - Drop obsolete patch jdk6-check-use-jdk7.patch - Refresh patch no-jdk5-requirement.patch - Attempt to refresh mysql-connector-java-jdbc-4.1.patch * Partialy merged by upstream, many conflicts OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=33
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
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
|
|
@@ -255,7 +255,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
|
|
|
|
|
|
<!-- Check for required JDKs for compilation. -->
|
|
- <target name="-compiler-check" depends="-jdk5-check, -jdk8-check, -jre6-rtjar-check" />
|
|
+ <target name="-compiler-check" depends="-jdk8-check, -jre6-rtjar-check" />
|
|
|
|
|
|
<!-- Check for required JDK5 for compilation of JDBC 3 implementation. -->
|
|
@@ -854,7 +854,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
deprecation="off"
|
|
debug="${debug.enable}"
|
|
fork="yes"
|
|
- executable="${com.mysql.jdbc.jdk5.javac}"
|
|
+ executable="${com.mysql.jdbc.jdk6.javac}"
|
|
compiler="modern"
|
|
includeantruntime="false"
|
|
source="1.5"
|
|
@@ -929,7 +929,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
deprecation="off"
|
|
debug="${debug.enable}"
|
|
fork="yes"
|
|
- executable="${com.mysql.jdbc.jdk5.javac}"
|
|
+ executable="${com.mysql.jdbc.jdk6.javac}"
|
|
compiler="modern"
|
|
includeantruntime="false"
|
|
source="1.5"
|