Author: ebourg-guest Date: 2013-08-09 12:56:55 +0000 (Fri, 09 Aug 2013) New Revision: 17134
Modified: trunk/mysql-connector-java/debian/changelog trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch trunk/mysql-connector-java/debian/rules Log: New upstream release (5.1.26) Refreshed the patches Generate Java 6 compatible bytecode Modified: trunk/mysql-connector-java/debian/changelog =================================================================== --- trunk/mysql-connector-java/debian/changelog 2013-08-08 11:25:04 UTC (rev 17133) +++ trunk/mysql-connector-java/debian/changelog 2013-08-09 12:56:55 UTC (rev 17134) @@ -1,3 +1,11 @@ +mysql-connector-java (5.1.26-1) unstable; urgency=low + + * New upstream release + * Refreshed the patches + * Generate Java 6 compatible bytecode + + -- Emmanuel Bourg <[email protected]> Fri, 09 Aug 2013 14:47:12 +0200 + mysql-connector-java (5.1.25-1) unstable; urgency=low * New upstream release Modified: trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch =================================================================== --- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2013-08-08 11:25:04 UTC (rev 17133) +++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2013-08-09 12:56:55 UTC (rev 17134) @@ -96,7 +96,7 @@ } --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -6101,4 +6101,56 @@ +@@ -6107,4 +6107,56 @@ return getSocketTimeout(); } } @@ -155,7 +155,7 @@ } --- a/src/com/mysql/jdbc/DatabaseMetaData.java +++ b/src/com/mysql/jdbc/DatabaseMetaData.java -@@ -8540,4 +8540,28 @@ +@@ -8694,4 +8694,20 @@ throws SQLException { return true; } @@ -168,14 +168,6 @@ + throw new UnsupportedOperationException(); + } + -+ public ResultSet getClientInfoProperties() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new UnsupportedOperationException(); + } @@ -249,7 +241,7 @@ } public void setParseInfoCacheFactory(String factoryClassname) { -@@ -2635,4 +2635,57 @@ +@@ -2643,4 +2643,57 @@ public String getConnectionAttributes() throws SQLException { return getActiveMySQLConnection().getConnectionAttributes(); } @@ -336,7 +328,7 @@ } --- a/src/com/mysql/jdbc/PreparedStatement.java +++ b/src/com/mysql/jdbc/PreparedStatement.java -@@ -5757,4 +5757,16 @@ +@@ -5759,4 +5759,16 @@ statementStartPos, sql, "SELECT", "\"'`", "\"'`", false) == -1 && rewritableOdku; } @@ -355,9 +347,9 @@ } --- a/src/com/mysql/jdbc/ReplicationConnection.java +++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -2695,4 +2695,56 @@ - public Object getConnectionMutex() { - return getCurrentConnection().getConnectionMutex(); +@@ -2707,4 +2707,56 @@ + public String getConnectionAttributes() throws SQLException { + return getCurrentConnection().getConnectionAttributes(); } + + public Clob createClob() throws SQLException { @@ -795,10 +787,19 @@ } --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java -@@ -2834,4 +2834,55 @@ +@@ -2842,7 +2842,59 @@ return this.mc.getConnectionMutex(); } +- public String getConnectionAttributes() throws SQLException { +- return this.mc.getConnectionAttributes(); +- } +-} +\ No newline at end of file ++ public String getConnectionAttributes() throws SQLException { ++ return this.mc.getConnectionAttributes(); ++ } ++ + public java.sql.Clob createClob() throws SQLException { + throw new UnsupportedOperationException(); + } @@ -850,8 +851,7 @@ + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new UnsupportedOperationException(); + } - } -\ No newline at end of file ++} --- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java +++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java @@ -450,4 +450,16 @@ @@ -889,7 +889,7 @@ \ No newline at end of file --- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java -@@ -1224,4 +1224,76 @@ +@@ -1240,4 +1240,76 @@ // public Object unwrap(Class arg0) throws SQLException { // throw SQLError.notImplemented(); // } Modified: trunk/mysql-connector-java/debian/rules =================================================================== --- trunk/mysql-connector-java/debian/rules 2013-08-08 11:25:04 UTC (rev 17133) +++ trunk/mysql-connector-java/debian/rules 2013-08-09 12:56:55 UTC (rev 17134) @@ -10,7 +10,9 @@ 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 \ - -Dsnapshot.version= + -Dsnapshot.version= \ + -Dant.build.javac.source=1.6 \ + -Dant.build.javac.target=1.6 binary-post-install/libmysql-java:: mh_installpoms -plibmysql-java -e$(VERSION) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
