rpm/mysql-connector-java
SHA256
1
0
Fork 0
forked from pool/mysql-connector-java
Code Pull Requests Activity
mysql-connector-java/jdk6-check-use-jdk7.patch

17 lines
896 B
Diff
Raw Normal View History

- Update to 5.1.35 (see CHANGES for full list of issues) bnc#927981 CVE-2015-2575: * http://dev.mysql.com/doc/relnotes/connector-j/en/news-5-1.html - Remove not applicable patch: * mysql-connector-java-7-jdbc-4.1.patch - Do not explicitely check for jdk6 but be happy with 7 and 8: * jdk6-check-use-jdk7.patch - Do not require hibernate4 to actually build: * extra-libs-build.patch - Do not build jdk5 depending jdbc3: * no-jdk5-requirement.patch - Add and rebase jdbc4.1 patch: * mysql-connector-java-jdbc-4.1.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=21
2015-04-21 17:01:55 +00:00
Index: mysql-connector-java-5.1.35/build.xml
===================================================================
--- mysql-connector-java-5.1.35.orig/build.xml
+++ mysql-connector-java-5.1.35/build.xml
@@ -267,10 +267,7 @@ Java 6 (for JDBC4+ implementation) is al
<fail message="Java 6 (for JDBC4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk6'. Default: '/usr/lib/jvm/jdk1.6'.">
<condition>
<not>
- <and>
- <equals arg1="${jdk6checkexitstatus}" arg2="0" />
- <contains string="${com.mysql.jdbc.jdk6.version}" substring="java version &quot;1.6" casesensitive="true" />
- </and>
+ <equals arg1="${jdk6checkexitstatus}" arg2="0" />
</not>
</condition>
</fail>
Copy Permalink