Package: jakarta-taglibs-standard
Version: 1.1.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888941):
- d/patches/java7-compat.patch: Compatibility patch for compilation
with Java 7 API.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4Ly8AAoJEL/srsug59jDKXIQAJ+z7g6LdcXY78tctEeV7mxl
Sa59JV35bfaYOGoJLf0UBuDcLw1g5mRtQxdlqSvJtQhrtdX+pQxeRjJdvgR21VqH
dJzfv5GKipvVqBJNWJYKei4Wzx+vY8Zm9yCU0FCYVd4KoiutXahVd2CMsW1xa04m
cYJ7lk/RhSjMZjpG3vtbjwp1R11rvJGImThkKyzArmN70CuEfbJ2NB1KYbUN6Kcr
ObtUpLOuUoc3xjcg8SqTiJwioUU+Oni/rxdqBlA++TONNQC9tMDMaRUaosN7Kk8U
N4RvDEqrtAQKE0m7OLFbJR5rTQ4swMvQvsIYawcDW5mq57w7+w5lgkmSOQXAOYkE
EDlMCJg6StGR2hXTTophBdeHp3TAzkShVRjaKG6Y/tAfwmZOzEJWyW3LmM9pVYjj
Y7isrG07Lzauu3P1Hr4Nq8/gjJmfFIO+IAHdU4dtS8HOjf6McYPV1cut4CTNv5xE
NjKDEv5/Yt6y2kEgH69jlKwDMH2Gi4UaVx40h35PF9ANPaVWgYu4/5xKNNcFvl39
WpCtITn4KdNsvFqPGRjw0pffWBCTw6qmzhDJ9ZPHjo9Mt5z3KBuiWiqH+uqatH/j
rcCJRnkYmKcnfVlDuAgtvK0Uht8YWwkU9Ei62GqeK0KdDiX5Q4UnP3NwKXQmdKw2
RuBQVA+gYWhSfNaqLVQI
=7O3Z
-----END PGP SIGNATURE-----
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/java7-compat.patch 2012-06-19 17:51:54 +0000
@@ -0,0 +1,25 @@
+Index: jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+===================================================================
+--- jakarta-taglibs-standard.orig/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:40:55.049170000 +0100
++++ jakarta-taglibs-standard/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-12 21:41:52.171712718 +0100
+@@ -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
+@@ -125,4 +128,10 @@
+ return null;
+ }
+
++ /*
++ * JDBC 4.1
++ */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-06-09 12:03:00 +0000
+++ debian/patches/series 2012-06-19 17:51:54 +0000
@@ -1 +1,2 @@
01_fix_build.diff
+java7-compat.patch
