The following commit has been merged in the master branch:
commit cf882e4560232f1296da05bb74eefcd7658b166a
Author: Martín Ferrari <[email protected]>
Date: Wed Jul 31 16:30:07 2013 +0200
Fix Java7 build issues. Closes: #717251, raising urgency.
Added debian/patches/01-compatible-with-java7.diff by ShuxiongYe
<[email protected]>.
diff --git a/debian/patches/01-compatible-with-java7.diff
b/debian/patches/01-compatible-with-java7.diff
new file mode 100644
index 0000000..2110c00
--- /dev/null
+++ b/debian/patches/01-compatible-with-java7.diff
@@ -0,0 +1,278 @@
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
2013-07-21 11:13:09.845351377 +0800
+@@ -29,6 +29,7 @@
+ import java.util.Properties;
+ import java.util.HashSet;
+ import java.util.Random;
++import java.util.concurrent.Executor;
+
+ import net.sourceforge.jtds.jdbc.cache.*;
+ import net.sourceforge.jtds.util.*;
+@@ -2614,4 +2615,26 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLException();
++ }
++
++ public String getSchema() throws SQLException {
++ throw new SQLException();
++ }
++
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLException();
++ }
++
++ public void setNetworkTimeout(Executor executor, int milliseconds)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index: libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/Driver.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/Driver.java
2009-12-30 23:45:52.000000000 +0800
++++ libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/Driver.java
2013-07-21 11:14:12.225660703 +0800
+@@ -21,11 +21,13 @@
+ import java.sql.DriverManager;
+ import java.sql.DriverPropertyInfo;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.Properties;
++import java.util.logging.Logger;
+
+ import net.sourceforge.jtds.ssl.Ssl;
+
+@@ -463,4 +465,9 @@
+ public static void main(String[] args) {
+ System.out.println("jTDS " + getVersion());
+ }
++
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
2013-07-21 11:14:21.365706037 +0800
+@@ -1075,4 +1075,15 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public <T> T getObject(int parameterIndex, Class<T> type)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++ public <T> T getObject(String parameterName, Class<T> type)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
2013-07-21 11:14:29.357745661 +0800
+@@ -783,7 +783,7 @@
+ * @throws SQLException if a database-access error occurs.
+ */
+ public String getExtraNameCharacters() throws SQLException {
+- // MS driver returns "$#@" Sybase JConnect returns "@#$��"
++ // MS driver returns "$#@" Sybase JConnect returns "@#$��"
+ return "$#@";
+ }
+
+@@ -3606,4 +3606,15 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
++ String tableNamePattern, String columnNamePattern)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
2013-07-21 11:14:37.577786415 +0800
+@@ -1766,4 +1766,14 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public <T> T getObject(int columnIndex, Class<T> type) throws
SQLException {
++ throw new SQLException();
++ }
++
++ public <T> T getObject(String columnLabel, Class<T> type)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
2013-07-21 11:14:47.413835196 +0800
+@@ -1346,4 +1346,13 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
2013-07-21 11:14:56.501880259 +0800
+@@ -20,6 +20,7 @@
+ import java.io.*;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.Properties;
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+@@ -780,4 +781,9 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public java.util.logging.Logger getParentLogger()
++ throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
2013-07-21 11:15:03.861916761 +0800
+@@ -22,6 +22,7 @@
+ import java.math.BigDecimal;
+ import java.sql.*;
+ import java.util.Calendar;
++import java.util.Map;
+
+ import net.sourceforge.jtds.jdbc.*;
+
+@@ -1955,4 +1956,15 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public <T> T getObject(int parameterIndex, Class<T> type)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++ public <T> T getObject(String parameterName, Class<T> type)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
2013-07-21 11:15:11.157952941 +0800
+@@ -20,6 +20,7 @@
+ import java.sql.*;
+ import java.util.Map;
+ import java.util.Properties;
++import java.util.concurrent.Executor;
+
+ import net.sourceforge.jtds.jdbc.*;
+ import net.sourceforge.jtds.jdbcx.*;
+@@ -804,4 +805,26 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLException();
++ }
++
++ public String getSchema() throws SQLException {
++ throw new SQLException();
++ }
++
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLException();
++ }
++
++ public void setNetworkTimeout(Executor executor, int milliseconds)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
+Index:
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
+===================================================================
+---
libjtds-java-1.2.5+dfsg.orig/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
2009-12-30 23:45:52.000000000 +0800
++++
libjtds-java-1.2.5+dfsg/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
2013-07-21 11:15:18.425988983 +0800
+@@ -740,4 +740,13 @@
+ throw new AbstractMethodError();
+ }
+
+-}
+\ No newline at end of file
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++}
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..15568ce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-compatible-with-java7.diff
--
libjtds-java: jTDS JDBC Driver for SQL Server and Sybase
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
