[mysql-connector-java] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Apr 27 09:53:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch jessie-security
in repository mysql-connector-java.
commit e04a2f37649fd8e98a6aa31e46a61418d5e395cb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Apr 27 11:44:38 2017 +0200
Refreshed the patches
---
debian/changelog | 8 ++++++++
debian/patches/0001-disable-testsuite.patch | 2 +-
debian/patches/0002-java6-compilation-compat.patch | 18 +++++++++---------
debian/patches/0003-disable-hibernate-fabric.patch | 2 +-
debian/patches/disable-JDBC42-invocation.patch | 6 ++----
debian/patches/remove-JDBC-4-classes.patch | 6 ++----
6 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8e2ab01..8487182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mysql-connector-java (5.1.41-1~deb8u1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 27 Apr 2017 11:43:56 +0200
+
mysql-connector-java (5.1.39-1~deb8u1) jessie-security; urgency=high
* Team upload.
diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch
index 9015e7b..3f8c393 100644
--- a/debian/patches/0001-disable-testsuite.patch
+++ b/debian/patches/0001-disable-testsuite.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable testsuite
--- a/build.xml
+++ b/build.xml
-@@ -833,7 +833,7 @@
+@@ -835,7 +835,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."
diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch
index 70f8aee..b6a6471 100644
--- a/debian/patches/0002-java6-compilation-compat.patch
+++ b/debian/patches/0002-java6-compilation-compat.patch
@@ -25,7 +25,7 @@ Subject: [PATCH] Java 8 compatibility
--- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
+++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
-@@ -3069,4 +3069,36 @@
+@@ -3065,4 +3065,36 @@
public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {
}
@@ -169,9 +169,9 @@ Subject: [PATCH] Java 8 compatibility
*/
--- a/src/com/mysql/jdbc/ConnectionImpl.java
+++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -5550,4 +5550,56 @@
- public void setProfilerEventHandlerInstance(ProfilerEventHandler h) {
- this.eventSink = h;
+@@ -5507,4 +5507,56 @@
+ }
+ }
}
+
+ public java.sql.Clob createClob() throws SQLException {
@@ -228,7 +228,7 @@ Subject: [PATCH] Java 8 compatibility
}
--- a/src/com/mysql/jdbc/DatabaseMetaData.java
+++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -7892,6 +7892,22 @@
+@@ -7880,6 +7880,22 @@
return pStmt;
}
@@ -312,7 +312,7 @@ Subject: [PATCH] Java 8 compatibility
}
--- a/src/com/mysql/jdbc/NonRegisteringDriver.java
+++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
-@@ -906,4 +906,9 @@
+@@ -908,4 +908,9 @@
}
}
}
@@ -324,7 +324,7 @@ Subject: [PATCH] Java 8 compatibility
}
--- a/src/com/mysql/jdbc/PreparedStatement.java
+++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5090,6 +5090,18 @@
+@@ -5096,6 +5096,18 @@
&& StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1;
}
@@ -345,7 +345,7 @@ Subject: [PATCH] Java 8 compatibility
* Same as PreparedStatement.executeUpdate() but returns long instead of int.
--- a/src/com/mysql/jdbc/ResultSetImpl.java
+++ b/src/com/mysql/jdbc/ResultSetImpl.java
-@@ -7918,4 +7918,200 @@
+@@ -7908,4 +7908,200 @@
protected ExceptionInterceptor getExceptionInterceptor() {
return this.exceptionInterceptor;
}
@@ -752,7 +752,7 @@ Subject: [PATCH] Java 8 compatibility
}
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
-@@ -429,4 +429,16 @@
+@@ -435,4 +435,16 @@
// public <T> T unwrap(Class<T> iface) throws SQLException {
// throw SQLError.createSQLFeatureNotSupportedException();
// }
diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch
index 130355b..3d01023 100644
--- a/debian/patches/0003-disable-hibernate-fabric.patch
+++ b/debian/patches/0003-disable-hibernate-fabric.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
</target>
-@@ -887,8 +889,10 @@
+@@ -889,8 +891,10 @@
bootclasspath="${com.mysql.jdbc.jre6.rtjar}"
source="1.6"
target="1.6">
diff --git a/debian/patches/disable-JDBC42-invocation.patch b/debian/patches/disable-JDBC42-invocation.patch
index 163c6da..954b96e 100644
--- a/debian/patches/disable-JDBC42-invocation.patch
+++ b/debian/patches/disable-JDBC42-invocation.patch
@@ -7,11 +7,9 @@ Debian-Bug: https://bugs.debian.org/828836
src/com/mysql/jdbc/Util.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
-diff --git a/src/com/mysql/jdbc/Util.java b/src/com/mysql/jdbc/Util.java
-index e9797ad..500a09c 100644
--- a/src/com/mysql/jdbc/Util.java
+++ b/src/com/mysql/jdbc/Util.java
-@@ -62,7 +62,7 @@ public class Util {
+@@ -62,7 +62,7 @@
private static boolean isJdbc4;
@@ -20,7 +18,7 @@ index e9797ad..500a09c 100644
private static int jvmVersion = -1;
-@@ -76,13 +76,6 @@ public class Util {
+@@ -78,13 +78,6 @@
isJdbc4 = false;
}
diff --git a/debian/patches/remove-JDBC-4-classes.patch b/debian/patches/remove-JDBC-4-classes.patch
index b0edbff..66426d1 100644
--- a/debian/patches/remove-JDBC-4-classes.patch
+++ b/debian/patches/remove-JDBC-4-classes.patch
@@ -8,11 +8,9 @@ Do not compile JDBC 4+ classes that require it.
build.xml | 33 ---------------------------------
1 file changed, 33 deletions(-)
-diff --git a/build.xml b/build.xml
-index 0dc5027..9bf7791 100644
--- a/build.xml
+++ b/build.xml
-@@ -899,25 +899,8 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
+@@ -901,25 +901,8 @@
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
</javac>
@@ -38,7 +36,7 @@ index 0dc5027..9bf7791 100644
<!-- Compile the driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite. -->
<target name="compile-testsuite"
description="Compiles driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite."
-@@ -958,22 +941,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
+@@ -960,22 +943,6 @@
<classpath refid="project.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
</javac>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git
More information about the pkg-java-commits
mailing list