From 0fc7d71015ae77ddb0d11d925b58c04ef8891ba6 Mon Sep 17 00:00:00 2001 From: gil Date: Dec 08 2015 10:51:27 +0000 Subject: fix jdbc-4.1 patch --- diff --git a/mysql-connector-java-5.1.38-jdbc4.1.patch b/mysql-connector-java-5.1.38-jdbc4.1.patch index e68d229..510f9d0 100644 --- a/mysql-connector-java-5.1.38-jdbc4.1.patch +++ b/mysql-connector-java-5.1.38-jdbc4.1.patch @@ -606,6 +606,30 @@ diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionW + throw new SQLFeatureNotSupportedException("Not supported"); + } } +diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java +--- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-02 02:13:22.000000000 +0100 ++++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-08 11:41:21.269740381 +0100 +@@ -25,6 +25,9 @@ + + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++ ++import java.util.logging.Logger; + + import javax.sql.ConnectionPoolDataSource; + import javax.sql.PooledConnection; +@@ -69,4 +72,10 @@ + + return mysqlPooledConnection; + } ++ ++ @Override ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not supported"); ++ } ++ + } diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-02 02:13:22.000000000 +0100 +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-08 10:47:50.251616360 +0100 @@ -642,7 +666,7 @@ diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSo } diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-08 10:08:38.453600178 +0100 ++++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-08 11:40:57.780887627 +0100 @@ -26,6 +26,7 @@ import java.lang.reflect.Constructor; import java.sql.Connection; @@ -659,18 +683,21 @@ diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooled import com.mysql.jdbc.ExceptionInterceptor; import com.mysql.jdbc.SQLError; -@@ -230,4 +232,10 @@ +@@ -230,4 +232,12 @@ protected ExceptionInterceptor getExceptionInterceptor() { return this.exceptionInterceptor; } +-} +\ Manca newline alla fine del file + + @Override + public void addStatementEventListener(StatementEventListener listener) {} + + @Override + public void removeStatementEventListener(StatementEventListener listener) {} - } -\ Manca newline alla fine del file ++ ++ ++} diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-02 02:13:22.000000000 +0100 +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-08 10:20:13.352619255 +0100 @@ -701,6 +728,33 @@ diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConn + @Override + public void removeStatementEventListener(StatementEventListener listener) {} } +diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java +--- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-02 02:13:22.000000000 +0100 ++++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-08 11:41:10.622260427 +0100 +@@ -25,6 +25,9 @@ + + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++ ++import java.util.logging.Logger; + + import javax.sql.XAConnection; + +@@ -69,4 +72,11 @@ + + return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands()); + } +-} +\ Manca newline alla fine del file ++ ++ @Override ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not supported"); ++ } ++ ++ ++} diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-08 09:58:13.636163459 +0100 diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 0f3c1a0..3279b28 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -4,7 +4,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 5.1.38 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -110,6 +110,9 @@ ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \ %license COPYING %changelog +* Tue Dec 08 2015 gil cattaneo 1:5.1.38-2 +- fix jdbc-4.1 patch + * Tue Dec 08 2015 gil cattaneo 1:5.1.38-1 - update to 5.1.38 - use upstream git tarball