[taglibs-standard] 08/12: Removed 01-jdbc-compatibility.patch (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository taglibs-standard.

commit 2ce85f4dd6ce0ab2d601dda1a6c14dc9ee581bb1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 20 17:30:41 2016 +0200

    Removed 01-jdbc-compatibility.patch (fixed upstream)
---
 debian/changelog                           |  1 +
 debian/patches/01-jdbc-compatibility.patch | 40 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43b51c0..0732a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ taglibs-standard (1.2.5-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+    - Removed 01-jdbc-compatibility.patch (fixed upstream)
     - Removed CVE-2015-0254.patch (fixed upstream)
   * Renamed the package to taglibs-standard
   * Standards-Version updated to 3.9.8
diff --git a/debian/patches/01-jdbc-compatibility.patch b/debian/patches/01-jdbc-compatibility.patch
deleted file mode 100644
index e20c45a..0000000
--- a/debian/patches/01-jdbc-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix the compatibility with the latest JDBC API
-Author: Onkar Shinde <onshinde at ubuntu.com>
-Forwarded: not-needed
---- a/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
-+++ b/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
-@@ -25,6 +25,9 @@
- 
- import org.apache.taglibs.standard.resources.Resources;
- 
-+import java.sql.SQLFeatureNotSupportedException;
-+import java.util.logging.Logger;
-+
- 
- /**
-  * <p>A simple <code>DataSource</code> wrapper for the standard
-@@ -111,5 +114,24 @@
-         throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-     }
- 
-+    /**
-+     * Placeholder method to fix compilation.
-+     */
-+    public boolean isWrapperFor(Class iface) throws SQLException {
-+        return true;
-+    }
-+
-+    /**
-+     * Placeholder method to fix compilation.
-+     */
-+    public Object unwrap(Class iface) throws SQLException {
-+        return null;
-+    }
- 
-+    /*
-+     * JDBC 4.1
-+     */
-+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+        throw new SQLFeatureNotSupportedException();
-+    }
- }
diff --git a/debian/patches/series b/debian/patches/series
index d668276..af58241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-jdbc-compatibility.patch
 02-servlet-api-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/taglibs-standard.git