[tomcat8] 02/02: Removed the obsolete patch 0012-java7-compat.patch

[Emmanuel Bourg]

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

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

commit 52acc30655bd22b4f2f5dbc38195f228ac4102c3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 25 13:32:08 2014 +0200

    Removed the obsolete patch 0012-java7-compat.patch
---
 debian/changelog                       |  1 +
 debian/patches/0012-java7-compat.patch | 25 -------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7493d56..ffca3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ tomcat8 (8.0.9-2) UNRELEASED; urgency=medium
 
   * Install the missing tomcat-dbcp.jar in libtomcat8-java and use it as
     the default JDBC pool implementation instead of Commons DBCP.
+  * Removed the obsolete patch 0012-java7-compat.patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 25 Jun 2014 11:40:20 +0200
 
diff --git a/debian/patches/0012-java7-compat.patch b/debian/patches/0012-java7-compat.patch
deleted file mode 100644
index 20778db..0000000
--- a/debian/patches/0012-java7-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Compatibility patch to support compilation of tomcat8
- using openjdk-7
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
---- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
-+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
-@@ -28,6 +28,8 @@
- import org.apache.juli.logging.Log;
- import org.apache.juli.logging.LogFactory;
- 
-+import java.sql.SQLFeatureNotSupportedException;
-+import java.util.logging.Logger;
- 
- /**
-  * A DataSource that can be instantiated through IoC and implements the DataSource interface
-@@ -156,5 +158,7 @@
-         }
-     }
- 
--
-+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+        throw new SQLFeatureNotSupportedException();
-+    }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 5632618..0780dbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 0006-add-JARs-below-var-to-class-loader.patch
 0009-Use-java.security.policy-file-in-catalina.sh.patch
 0010-debianize-build-xml.patch
-0012-java7-compat.patch
 0013-dont-look-for-build-properties-in-user-home.patch
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch

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