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
67 lines
3.8 KiB
Diff
67 lines
3.8 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
|
|
@@ -513,7 +513,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Add commercial license configuration class (Build). -->
|
|
- <target name="-init-filter-license" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.filterLicense">
|
|
+ <target name="-init-filter-license" depends="-init-copy" if="com.mysql.jdbc.filterLicense">
|
|
<copy file="${com.mysql.jdbc.extra.libs}/CommercialLicenseConfiguration.notjava"
|
|
toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/LicenseConfiguration.java"
|
|
overwrite="true" />
|
|
@@ -521,7 +521,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Add no-crypto export control class (Build). -->
|
|
- <target name="-init-no-crypto" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.noCryptoBuild">
|
|
+ <target name="-init-no-crypto" depends="-init-copy" if="com.mysql.jdbc.noCryptoBuild">
|
|
<copy file="${com.mysql.jdbc.extra.libs}/ExportControlledNoCrypto.notjava"
|
|
toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/ExportControlled.java"
|
|
overwrite="true" />
|
|
@@ -529,7 +529,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Copy commercial license configuration class (Package). -->
|
|
- <target name="-copy-filter-license" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.filterLicense">
|
|
+ <target name="-copy-filter-license" depends="-init-copy" if="com.mysql.jdbc.filterLicense">
|
|
<copy file="${com.mysql.jdbc.extra.libs}/CommercialLicenseConfiguration.notjava"
|
|
toFile="${packageDest}/src/com/mysql/jdbc/LicenseConfiguration.java"
|
|
overwrite="true" />
|
|
@@ -537,7 +537,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Copy no-crypto export control class (Package). -->
|
|
- <target name="-copy-no-crypto" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.noCryptoBuild">
|
|
+ <target name="-copy-no-crypto" depends="-init-copy" if="com.mysql.jdbc.noCryptoBuild">
|
|
<copy file="${com.mysql.jdbc.extra.libs}/ExportControlledNoCrypto.notjava"
|
|
toFile="${packageDest}/src/com/mysql/jdbc/ExportControlled.java"
|
|
overwrite="true" />
|
|
@@ -545,7 +545,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Copy README-commercial info (Package). -->
|
|
- <target name="-copy-readme-commercial" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.commercialBuild">
|
|
+ <target name="-copy-readme-commercial" depends="-init-copy" if="com.mysql.jdbc.commercialBuild">
|
|
<copy file="${com.mysql.jdbc.extra.libs}/README-commercial" tofile="${packageDest}/README.txt" filtering="true">
|
|
<filterset refid="versionFilterset" />
|
|
<filterset refid="licenseFilterset" />
|
|
@@ -564,7 +564,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
|
|
|
|
<!-- Copy LICENCE.mysql and replace license commercial headers (Package). -->
|
|
- <target name="-replace-license-commercial" depends="-extra-libs-check, -init-copy" if="com.mysql.jdbc.commercialBuild">
|
|
+ <target name="-replace-license-commercial" depends="-init-copy" if="com.mysql.jdbc.commercialBuild">
|
|
<delete file="${packageDest}/COPYING" />
|
|
<copy file="${com.mysql.jdbc.extra.libs}/LICENSE.mysql" toDir="${packageDest}" />
|
|
|
|
@@ -860,6 +860,7 @@ Java 8 (for JDBC 4+ implementation) is a
|
|
source="1.5"
|
|
target="1.5">
|
|
<include name="**/*.java" />
|
|
+ <exclude name="demo/**" />
|
|
<exclude name="testsuite/**" />
|
|
<exclude name="com/mysql/jdbc/integration/**" />
|
|
<exclude name="com/mysql/jdbc/log/Log4JLogger.java" />
|