pool/mysql-connector-java
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix the patches to allow jdbc3 build and reenable it:

Browse Source 
* mysql-connector-java-jdbc-4.1.patch
  * no-jdk5-requirement.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=27
This commit is contained in:
Tomáš Chvátal 2015-06-11 15:13:13 +00:00 committed by Git OBS Bridge
parent e1f41462f5
commit 3e31a322cf
4 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-connector-java-jdbc-4.1.patch
View File

@ -272,15 +272,17 @@ Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/Driver.java
/**
* The Java SQL framework allows for multiple database drivers. Each driver should supply a class that implements the Driver interface
@@ -62,3 +64,8 @@ public class Driver extends NonRegisteri
@@ -61,4 +63,10 @@ public class Driver extends NonRegisteri
public Driver() throws SQLException {
// Required for Class.forName().newInstance()
}
}
+
+ @Override
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException("Not supported");
+ }
+
}
Index: mysql-connector-java-5.1.35/src/com/mysql/jdbc/JDBC4Connection.java
===================================================================
--- mysql-connector-java-5.1.35.orig/src/com/mysql/jdbc/JDBC4Connection.java
@ -1502,10 +1504,10 @@ Index: mysql-connector-java-5.1.35/src/testsuite/regression/StatementRegressionT
pStmt.executeUpdate();
} finally {
if (pStmt != null) {
@@ -5277,6 +5283,271 @@ public class StatementRegressionTest ext
Connection conn1 = null;
@@ -4606,6 +4612,271 @@ public class StatementRegressionTest ext
public int getBytesSize() throws SQLException {
return 0;
}
+ @Override
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+ throw new SQLFeatureNotSupportedException("Not supported");
@ -1771,8 +1773,8 @@ Index: mysql-connector-java-5.1.35/src/testsuite/regression/StatementRegressionT
+ public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException {
+ throw new SQLFeatureNotSupportedException("Not supported");
+ }
try {
assertEquals(1, this.stmt.executeUpdate("INSERT INTO bug43196 (a) VALUES (1)", Statement.RETURN_GENERATED_KEYS));
};
}
@@ -6911,6 +7182,7 @@ public class StatementRegressionTest ext
expectedUpdCountBatchPStmt = expectedUpdCountBatchPStmtRW;

7
mysql-connector-java.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 11 15:11:55 UTC 2015 - tchvatal@suse.com
- Fix the patches to allow jdbc3 build and reenable it:
* mysql-connector-java-jdbc-4.1.patch
* no-jdk5-requirement.patch
-------------------------------------------------------------------
Tue Apr 21 15:22:44 UTC 2015 - tchvatal@suse.com

3
mysql-connector-java.spec
View File

@ -104,7 +104,8 @@ ant \
-DbuildDir=build-mysql-jdbc \
-DdistDir=dist-mysql-jdbc \
-Dcom.mysql.jdbc.jdk6.javac="%{javac}" \
-Dcom.mysql.jdbc.jdk6.java="%{java}"
-Dcom.mysql.jdbc.jdk6.java="%{java}" \
dist
%install
install -d -m 755 %{buildroot}%{_javadir}

54
no-jdk5-requirement.patch
View File

@ -11,43 +11,21 @@ Index: mysql-connector-java-5.1.35/build.xml
<!-- Check for required JDK5 for compilation of JDBC3 implementation. -->
@@ -756,7 +756,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Compile the driver including JDBC3 and JDBC4+ implementations only. -->
<target name="compile-driver"
description="Compiles driver including JDBC3 and JDBC4+ implementations only."
- depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />
+ depends="-compile-driver-jdbc4" />
<!-- Compile JDBC3 implementation. -->
@@ -787,7 +787,7 @@ Java 6 (for JDBC4+ implementation) is al
<!-- Compile JDBC4+ implementation. -->
- <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">
+ <target name="-compile-driver-jdbc4" depends="init, -clean-output">
<echo>Compiling MySQL Connector/J JDBC4+ implementation with '${com.mysql.jdbc.jdk6}' to '${compiler.output}'</echo>
<javac sourcepath=""
@@ -816,21 +816,6 @@ Java 6 (for JDBC4+ implementation) is al
<javac sourcepath=""
srcdir="${buildDir}/${fullProdName}"
- destdir="${compiler.output}"
- deprecation="off"
- debug="${debug.enable}"
- fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
- compiler="modern"
- includeantruntime="false">
- <include name="testsuite/**" />
- <exclude name="testsuite/requiresNonRedists/**" />
- <exclude name="testsuite/**/jdbc4/**" />
- <classpath refid="project.build.classpath" />
- </javac>
-
- <javac sourcepath=""
- srcdir="${buildDir}/${fullProdName}"
destdir="${compiler.output}"
@@ -769,7 +769,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="**/*.java" />
@@ -820,7 +820,7 @@ Java 6 (for JDBC4+ implementation) is al
deprecation="off"
debug="${debug.enable}"
fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}"
compiler="modern"
includeantruntime="false">
<include name="testsuite/**" />