This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mysql-connector-java.
commit 34720e9591f7edd8e70b96cc26a3be0339a7bda0 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 27 12:24:22 2015 +0100 Refreshed the patches --- debian/changelog | 8 + debian/control | 2 +- debian/patches/0001-disable-testsuite.patch | 14 +- debian/patches/0002-java6-compilation-compat.patch | 596 +++++++-------------- debian/patches/0003-disable-hibernate-fabric.patch | 32 +- debian/patches/0004-skip-jdk-check.patch | 14 + debian/patches/series | 1 + debian/rules | 8 +- 8 files changed, 264 insertions(+), 411 deletions(-) diff --git a/debian/changelog b/debian/changelog index 294152d..4eba7ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mysql-connector-java (5.1.37-1) UNRELEASED; urgency=medium + + * New upstream release + - Refreshed the patches + - Build depend on Java 8 + + -- Emmanuel Bourg <[email protected]> Tue, 27 Oct 2015 10:00:36 +0100 + mysql-connector-java (5.1.32-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 36a2078..3f2f63b 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marcus Better <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 9), cdbs, ant, ant-optional -Build-Depends-Indep: default-jdk, junit, ant-contrib, maven-repo-helper, libslf4j-java +Build-Depends-Indep: default-jdk (>= 2:1.8), junit, ant-contrib, maven-repo-helper, libslf4j-java Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/mysql-connector-java.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/mysql-connector-java.git diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch index 3f1776f..8a774dc 100644 --- a/debian/patches/0001-disable-testsuite.patch +++ b/debian/patches/0001-disable-testsuite.patch @@ -8,12 +8,12 @@ Subject: [PATCH] disable testsuite --- a/build.xml +++ b/build.xml -@@ -832,7 +832,7 @@ - </target> +@@ -804,7 +804,7 @@ + <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and 'helpers' for third-party software. --> + <target name="compile" + description="Compiles driver including JDBC 3 and JDBC 4+ implementations, JUnit test suite and integration 'helpers' for third-party software." +- depends="init, compile-driver, compile-testsuite, compile-integration" /> ++ depends="init, compile-driver, compile-integration" /> -- <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration" /> -+ <target name="compile" depends="init, compile-driver, compile.integration" /> - - <!-- Compiles the driver itself --> - + <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only. --> diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch index 59e2bb1..0a5f5c3 100644 --- a/debian/patches/0002-java6-compilation-compat.patch +++ b/debian/patches/0002-java6-compilation-compat.patch @@ -1,27 +1,85 @@ -Description: This patch adds dummy JDBC4 methods to enable the compilation - with Java 6 or 7 and no longer require Java 5 -Author: Emmanuel Bourg <[email protected]> +From 3186d1ff965c608171d34903d6c0b8c91a866c43 Mon Sep 17 00:00:00 2001 +From: Emmanuel Bourg <[email protected]> +Date: Tue, 27 Oct 2015 11:35:57 +0100 +Subject: [PATCH] Java 8 compatibility + +--- + .../fabric/jdbc/FabricMySQLConnectionProxy.java | 32 ++++ + src/com/mysql/fabric/jdbc/FabricMySQLDriver.java | 4 +- + src/com/mysql/jdbc/CallableStatement.java | 84 +++++++++ + src/com/mysql/jdbc/ConnectionImpl.java | 52 ++++++ + src/com/mysql/jdbc/DatabaseMetaData.java | 16 ++ + src/com/mysql/jdbc/MultiHostMySQLConnection.java | 52 ++++++ + src/com/mysql/jdbc/NonRegisteringDriver.java | 5 + + src/com/mysql/jdbc/PreparedStatement.java | 12 ++ + src/com/mysql/jdbc/ReplicationConnection.java | 52 ++++++ + src/com/mysql/jdbc/ResultSetImpl.java | 196 +++++++++++++++++++++ + .../jdbc2/optional/CallableStatementWrapper.java | 136 ++++++++++++++ + .../jdbc/jdbc2/optional/ConnectionWrapper.java | 52 ++++++ + .../mysql/jdbc/jdbc2/optional/MysqlDataSource.java | 12 ++ + .../jdbc/jdbc2/optional/MysqlPooledConnection.java | 11 ++ + .../jdbc2/optional/PreparedStatementWrapper.java | 72 ++++++++ + .../jdbc/jdbc2/optional/StatementWrapper.java | 28 +++ + .../jdbc2/optional/SuspendableXAConnection.java | 8 + + 17 files changed, 822 insertions(+), 2 deletions(-) + +--- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java ++++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java +@@ -2999,4 +2999,36 @@ + + public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { + } ++ ++ public java.sql.Clob createClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Blob createBlob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.NClob createNClob() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.SQLXML createSQLXML() throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } + } +--- a/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java ++++ b/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java +@@ -103,7 +103,7 @@ + return super.parseURL(url.replaceAll("fabric:", ""), defaults); + } + +- public Logger getParentLogger() throws SQLException { +- throw new SQLException("no logging"); ++ public Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { ++ throw new java.sql.SQLFeatureNotSupportedException("no logging"); + } + } --- a/src/com/mysql/jdbc/CallableStatement.java +++ b/src/com/mysql/jdbc/CallableStatement.java -@@ -427,11 +427,11 @@ - * @throws java.sql.SQLException If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class<?> iface) throws java.sql.SQLException { -+ public <T> T unwrap(Class<T> iface) throws SQLException { - try { - // This works for classes that aren't actually wrapping - // anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), - SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); -@@ -2671,4 +2671,76 @@ - } - } - } -+ +@@ -2381,6 +2381,90 @@ + } + } + + public java.sql.RowId getRowId(int parameterIndex) throws SQLException { + throw new UnsupportedOperationException(); + } @@ -93,13 +151,28 @@ Author: Emmanuel Bourg <[email protected]> + public void setNClob(String parameterName, Reader reader) throws SQLException { + throw new UnsupportedOperationException(); + } - } ++ ++ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ + /** + * JDBC 4.2 + */ --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -6122,4 +6122,56 @@ - public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { - this.eventSink = h; - } +@@ -5586,4 +5586,56 @@ + public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { + this.eventSink = h; + } + + public java.sql.Clob createClob() throws SQLException { + throw new UnsupportedOperationException(); @@ -155,11 +228,10 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/DatabaseMetaData.java +++ b/src/com/mysql/jdbc/DatabaseMetaData.java -@@ -8829,4 +8829,20 @@ - throws SQLException { - return true; - } -+ +@@ -7865,6 +7865,22 @@ + return pStmt; + } + + public java.sql.RowIdLifetime getRowIdLifetime() throws SQLException { + throw new UnsupportedOperationException(); + } @@ -173,15 +245,19 @@ Author: Emmanuel Bourg <[email protected]> + } + + public boolean isWrapperFor(Class<?> iface) throws SQLException { -+ throw new SQLException(); ++ throw new UnsupportedOperationException(); + } - } ---- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java -+++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java -@@ -2683,6 +2683,58 @@ - - } - ++ + /** + * JDBC-4.1 + * +--- a/src/com/mysql/jdbc/MultiHostMySQLConnection.java ++++ b/src/com/mysql/jdbc/MultiHostMySQLConnection.java +@@ -2427,4 +2427,56 @@ + public void setEnableEscapeProcessing(boolean flag) { + getActiveMySQLConnection().setEnableEscapeProcessing(flag); + } ++ + public java.sql.Clob createClob() throws SQLException { + throw new UnsupportedOperationException(); + } @@ -233,44 +309,25 @@ Author: Emmanuel Bourg <[email protected]> + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new UnsupportedOperationException(); + } -+ - public void setDetectCustomCollations(boolean detectCustomCollations) { - getActiveMySQLConnection().setDetectCustomCollations(detectCustomCollations); - } ---- a/src/com/mysql/jdbc/MysqlParameterMetadata.java -+++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java -@@ -201,11 +201,11 @@ - * @throws java.sql.SQLException If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class<?> iface) throws java.sql.SQLException { -+ public <T> T unwrap(Class<T> iface) throws SQLException { - try { - // This works for classes that aren't actually wrapping - // anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), - SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); + } --- a/src/com/mysql/jdbc/NonRegisteringDriver.java +++ b/src/com/mysql/jdbc/NonRegisteringDriver.java -@@ -1002,4 +1002,8 @@ - } - } - } +@@ -906,4 +906,9 @@ + } + } + } + ++ @Override + public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { + throw new java.sql.SQLFeatureNotSupportedException(); + } } --- a/src/com/mysql/jdbc/PreparedStatement.java +++ b/src/com/mysql/jdbc/PreparedStatement.java -@@ -5623,4 +5623,16 @@ - && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", - StringUtils.SEARCH_MODE__MRK_COM_WS) == -1 && rewritableOdku; - } -+ +@@ -5086,6 +5086,18 @@ + && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1; + } + + public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { + throw new UnsupportedOperationException(); + } @@ -282,19 +339,22 @@ Author: Emmanuel Bourg <[email protected]> + public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException { + throw new UnsupportedOperationException(); + } - } ++ + /** + * JDBC 4.2 + * Same as PreparedStatement.executeUpdate() but returns long instead of int. --- a/src/com/mysql/jdbc/ReplicationConnection.java +++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -3035,4 +3035,56 @@ - public boolean getDontCheckOnDuplicateKeyUpdateInSQL() { - return getCurrentConnection().getDontCheckOnDuplicateKeyUpdateInSQL(); - } +@@ -3030,4 +3030,56 @@ + public void setEnableEscapeProcessing(boolean flag) { + getCurrentConnection().setEnableEscapeProcessing(flag); + } + -+ public Clob createClob() throws SQLException { ++ public java.sql.Clob createClob() throws SQLException { + throw new UnsupportedOperationException(); + } + -+ public Blob createBlob() throws SQLException { ++ public java.sql.Blob createBlob() throws SQLException { + throw new UnsupportedOperationException(); + } + @@ -344,10 +404,10 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/ResultSetImpl.java +++ b/src/com/mysql/jdbc/ResultSetImpl.java -@@ -8751,4 +8751,200 @@ - protected ExceptionInterceptor getExceptionInterceptor() { - return this.exceptionInterceptor; - } +@@ -7923,4 +7923,200 @@ + protected ExceptionInterceptor getExceptionInterceptor() { + return this.exceptionInterceptor; + } + + public java.sql.RowId getRowId(int columnIndex) throws SQLException { + throw new UnsupportedOperationException(); @@ -545,44 +605,13 @@ Author: Emmanuel Bourg <[email protected]> + throw new UnsupportedOperationException(); + } } ---- a/src/com/mysql/jdbc/ResultSetMetaData.java -+++ b/src/com/mysql/jdbc/ResultSetMetaData.java -@@ -850,11 +850,11 @@ - * @throws java.sql.SQLException If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class<?> iface) throws java.sql.SQLException { -+ public <T> T unwrap(Class<T> iface) throws SQLException { - try { - // This works for classes that aren't actually wrapping - // anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), - SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); ---- a/src/com/mysql/jdbc/StatementImpl.java -+++ b/src/com/mysql/jdbc/StatementImpl.java -@@ -2902,11 +2902,11 @@ - * @throws java.sql.SQLException If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class<?> iface) throws java.sql.SQLException { -+ public <T> T unwrap(Class<T> iface) throws SQLException { - try { - // This works for classes that aren't actually wrapping - // anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), - SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); --- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java -@@ -2634,4 +2634,139 @@ - // throw SQLError.notImplemented(); - // } +@@ -1512,6 +1512,142 @@ + return null; + } ++ + public java.sql.RowId getRowId(int parameterIndex) throws SQLException { + throw new UnsupportedOperationException(); + } @@ -718,16 +747,15 @@ Author: Emmanuel Bourg <[email protected]> + public <T> T getObject(String parameterName, Class<T> type) throws SQLException { + throw new UnsupportedOperationException(); + } - } + // + // public Reader getCharacterStream(int parameterIndex) throws SQLException { + // try { --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java -@@ -2907,4 +2907,58 @@ - public boolean getDontCheckOnDuplicateKeyUpdateInSQL() { - return this.mc.getDontCheckOnDuplicateKeyUpdateInSQL(); - } --} -\ No newline at end of file -+ +@@ -2852,4 +2852,56 @@ + public void setEnableEscapeProcessing(boolean flag) { + this.mc.setEnableEscapeProcessing(flag); + } + + public java.sql.Clob createClob() throws SQLException { + throw new UnsupportedOperationException(); @@ -780,15 +808,14 @@ Author: Emmanuel Bourg <[email protected]> + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new UnsupportedOperationException(); + } -+ -+} + } --- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java +++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java -@@ -448,4 +448,16 @@ - // public <T> T unwrap(Class<T> iface) throws SQLException { - // throw SQLError.notImplemented(); - // } -+ +@@ -429,4 +429,16 @@ + // public <T> T unwrap(Class<T> iface) throws SQLException { + // throw SQLError.createSQLFeatureNotSupportedException(); + // } ++ + public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { + throw new java.sql.SQLFeatureNotSupportedException(); + } @@ -803,15 +830,25 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java +++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java -@@ -253,4 +253,12 @@ - protected ExceptionInterceptor getExceptionInterceptor() { - return this.exceptionInterceptor; - } -+ +@@ -33,6 +33,7 @@ + import javax.sql.ConnectionEvent; + import javax.sql.ConnectionEventListener; + import javax.sql.PooledConnection; ++import javax.sql.StatementEventListener; + + import com.mysql.jdbc.ExceptionInterceptor; + import com.mysql.jdbc.SQLError; +@@ -230,4 +231,14 @@ + protected ExceptionInterceptor getExceptionInterceptor() { + return this.exceptionInterceptor; + } ++ ++ @Override + public void addStatementEventListener(javax.sql.StatementEventListener listener) { + throw new UnsupportedOperationException(); + } + ++ @Override + public void removeStatementEventListener(javax.sql.StatementEventListener listener) { + throw new UnsupportedOperationException(); + } @@ -819,11 +856,10 @@ Author: Emmanuel Bourg <[email protected]> \ No newline at end of file --- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java -@@ -1238,4 +1238,76 @@ - // public Object unwrap(Class arg0) throws SQLException { - // throw SQLError.notImplemented(); - // } -+ +@@ -748,6 +748,78 @@ + return buf.toString(); + } + + public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { + throw new UnsupportedOperationException(); + } @@ -895,31 +931,33 @@ Author: Emmanuel Bourg <[email protected]> + public void setNClob(int parameterIndex, Reader reader) throws SQLException { + throw new UnsupportedOperationException(); + } - } ++ + // + // public void setAsciiStream(int parameterIndex, InputStream x) + // throws SQLException { --- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java -@@ -864,4 +864,32 @@ - checkAndFireConnectionError(sqlEx); - } - } -+ -+ public boolean isClosed() throws SQLException { +@@ -769,6 +769,34 @@ + } + } + ++ public void closeOnCompletion() throws SQLException { + throw new UnsupportedOperationException(); + } + -+ public void setPoolable(boolean poolable) throws SQLException { ++ public boolean isCloseOnCompletion() throws SQLException { + throw new UnsupportedOperationException(); + } + -+ public boolean isPoolable() throws SQLException { ++ public boolean isClosed() throws SQLException { + throw new UnsupportedOperationException(); + } + -+ public void closeOnCompletion() throws SQLException { ++ public void setPoolable(boolean poolable) throws SQLException { + throw new UnsupportedOperationException(); + } + -+ public boolean isCloseOnCompletion() throws SQLException { ++ public boolean isPoolable() throws SQLException { + throw new UnsupportedOperationException(); + } + @@ -930,248 +968,22 @@ Author: Emmanuel Bourg <[email protected]> + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new UnsupportedOperationException(); + } - } ---- a/src/testsuite/regression/StatementRegressionTest.java -+++ b/src/testsuite/regression/StatementRegressionTest.java -@@ -2531,7 +2531,7 @@ - try { - pStmt = this.conn - .prepareStatement("INSERT INTO testNullClob VALUES (?)"); -- pStmt.setClob(1, null); -+ pStmt.setClob(1, (Clob) null); - pStmt.executeUpdate(); - } finally { - if (pStmt != null) { -@@ -5279,7 +5279,180 @@ - public int getBytesSize() throws SQLException { - return 0; - } -- }; -+ -+ public java.sql.RowId getRowId(int columnIndex) throws SQLException { -+ return null; -+ } -+ -+ public java.sql.RowId getRowId(String columnLabel) throws SQLException { -+ return null; -+ } -+ -+ public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException { -+ } -+ -+ public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException { -+ } -+ -+ public int getHoldability() throws SQLException { -+ return 0; -+ } -+ -+ public boolean isClosed() throws SQLException { -+ return false; -+ } -+ -+ public void updateNString(int columnIndex, String nString) throws SQLException { -+ } -+ -+ public void updateNString(String columnLabel, String nString) throws SQLException { -+ } -+ -+ public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException { -+ } -+ -+ public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException { -+ } -+ -+ public java.sql.NClob getNClob(int columnIndex) throws SQLException { -+ return null; -+ } -+ -+ public java.sql.NClob getNClob(String columnLabel) throws SQLException { -+ return null; -+ } -+ -+ public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException { -+ return null; -+ } -+ -+ public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException { -+ return null; -+ } -+ -+ public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException { -+ } -+ -+ public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException { -+ } -+ -+ public String getNString(int columnIndex) throws SQLException { -+ return null; -+ } -+ -+ public String getNString(String columnLabel) throws SQLException { -+ return null; -+ } -+ -+ public Reader getNCharacterStream(int columnIndex) throws SQLException { -+ return null; -+ } -+ -+ public Reader getNCharacterStream(String columnLabel) throws SQLException { -+ return null; -+ } -+ -+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ } + -+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ } + /** + * JDBC 4.2 + * Same as {@link #executeBatch()} but returns long[] instead of int[]. +--- a/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java ++++ b/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java +@@ -199,4 +199,12 @@ + this.currentXAConnection.close(); + } + } + -+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { -+ } -+ -+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { -+ } -+ -+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ } -+ -+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { -+ } -+ -+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { -+ } -+ -+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ } -+ -+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { -+ } -+ -+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { -+ } -+ -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { -+ } -+ -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { -+ } -+ -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { -+ -+ } -+ -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { -+ } -+ -+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { -+ } -+ -+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ } -+ -+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { -+ } -+ -+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { -+ } -+ -+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { -+ } -+ -+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { -+ } -+ -+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { -+ } -+ -+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ } -+ -+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { -+ } -+ -+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { -+ } -+ -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { -+ } -+ -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { -+ } -+ -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { -+ } -+ -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { -+ } -+ -+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { -+ return null; -+ } -+ -+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { -+ return null; -+ } -+ -+ public <T> T unwrap(Class<T> iface) throws SQLException { -+ return null; -+ } ++ public void addStatementEventListener(javax.sql.StatementEventListener listener) { ++ throw new UnsupportedOperationException(); ++ } + -+ public boolean isWrapperFor(Class<?> iface) throws SQLException { -+ return false; -+ } -+ }; - } - - /** ---- a/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java -+++ b/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java -@@ -101,7 +101,7 @@ - return super.parseURL(url.replaceAll("fabric:", ""), defaults); - } - -- public Logger getParentLogger() throws SQLException { -- throw new SQLException("no logging"); -+ public Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException { -+ throw new java.sql.SQLFeatureNotSupportedException(); - } - } ---- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java -+++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java -@@ -2815,4 +2815,36 @@ - public void decachePreparedStatement(ServerPreparedStatement pstmt) - throws SQLException { - } -+ -+ public java.sql.Clob createClob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Blob createBlob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.NClob createNClob() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.SQLXML createSQLXML() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } ++ public void removeStatementEventListener(javax.sql.StatementEventListener listener) { ++ throw new UnsupportedOperationException(); ++ } } diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch index 96e49bf..919ce59 100644 --- a/debian/patches/0003-disable-hibernate-fabric.patch +++ b/debian/patches/0003-disable-hibernate-fabric.patch @@ -3,14 +3,30 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -866,8 +866,10 @@ - compiler="modern" - sourcepath="" srcdir="${buildDir}/${fullProdName}" - bootclasspath="${com.mysql.jdbc.java6.rtjar}"> +@@ -218,6 +218,7 @@ + </not> + </condition> + </fail> +<!-- - <include name="**/FabricMultiTenantConnectionProvider.java"/> - <include name="**/HibernateFabric.java"/> + <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'."> + <condition> + <not> +@@ -225,6 +226,7 @@ + </not> + </condition> + </fail> +--> - <include name="**/JDBC4*.java" /> - <include name="com/mysql/jdbc/exceptions/jdbc4/*" /> + </target> + +@@ -857,8 +859,10 @@ + bootclasspath="${com.mysql.jdbc.jre6.rtjar}" + source="1.6" + target="1.6"> ++<!-- + <include name="**/FabricMultiTenantConnectionProvider.java" /> + <include name="**/HibernateFabric.java" /> ++--> + <include name="**/JDBC4*.java" /> + <exclude name="**/JDBC42*.java" /> + <include name="com/mysql/jdbc/exceptions/jdbc4/*" /> diff --git a/debian/patches/0004-skip-jdk-check.patch b/debian/patches/0004-skip-jdk-check.patch new file mode 100644 index 0000000..8e74efa --- /dev/null +++ b/debian/patches/0004-skip-jdk-check.patch @@ -0,0 +1,14 @@ +Description: Disable the JDK check +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -389,7 +389,7 @@ + + + <!-- Prepares files and settings for compiling driver. --> +- <target name="init" depends="-compiler-check, -init-copy, -init-filter-license, -init-no-crypto"> ++ <target name="init" depends="-init-copy, -init-filter-license, -init-no-crypto"> + <!-- The following is needed for source distributions as the classpath can't be dynamically altered, and not having this directory present causes the + build to fail. --> + <available file="${com.mysql.jdbc.docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" /> diff --git a/debian/patches/series b/debian/patches/series index 7fa19bb..2aab2dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-disable-testsuite.patch 0002-java6-compilation-compat.patch 0003-disable-hibernate-fabric.patch +0004-skip-jdk-check.patch diff --git a/debian/rules b/debian/rules index 4383ed7..88c0adb 100755 --- a/debian/rules +++ b/debian/rules @@ -8,18 +8,20 @@ VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api -DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac \ - -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/jre/lib/rt.jar \ +DEB_ANT_ARGS := \ + -Dcom.mysql.jdbc.jdk5.javac=$(JAVA_HOME)/bin/javac \ + -Dcom.mysql.jdbc.jdk8.javac=$(JAVA_HOME)/bin/javac \ -Dsnapshot.version= \ -Dcom.mysql.jdbc.extra.libs=lib \ -Dant.java.version=1.5 \ -Dant.build.javac.source=1.6 \ - -Dant.build.javac.target=1.6 + -Dant.build.javac.target=1.7 pre-build:: mkdir -p lib mkdir -p src/lib ln -f -s /usr/share/java/ant-contrib.jar lib/ant-contrib.jar + ln -f -s /usr/share/java/slf4j-api.jar lib/slf4j-api.jar binary-post-install/libmysql-java:: mh_installpoms -plibmysql-java -e$(VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
