[pkg-java] r17856 - in tags/libcommons-dbcp-java: . 1.4-4/debian 1.4-4/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 11 07:41:49 UTC 2014
Author: ebourg-guest
Date: 2014-03-11 07:41:49 +0000 (Tue, 11 Mar 2014)
New Revision: 17856
Added:
tags/libcommons-dbcp-java/1.4-4/
tags/libcommons-dbcp-java/1.4-4/debian/README.source
tags/libcommons-dbcp-java/1.4-4/debian/changelog
tags/libcommons-dbcp-java/1.4-4/debian/compat
tags/libcommons-dbcp-java/1.4-4/debian/control
tags/libcommons-dbcp-java/1.4-4/debian/copyright
tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms
tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules
tags/libcommons-dbcp-java/1.4-4/debian/maven.properties
tags/libcommons-dbcp-java/1.4-4/debian/maven.rules
tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh
tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch
tags/libcommons-dbcp-java/1.4-4/debian/patches/03_exclude-transactions-tests.patch
tags/libcommons-dbcp-java/1.4-4/debian/patches/series
tags/libcommons-dbcp-java/1.4-4/debian/rules
Removed:
tags/libcommons-dbcp-java/1.4-4/debian/README.source
tags/libcommons-dbcp-java/1.4-4/debian/TODO
tags/libcommons-dbcp-java/1.4-4/debian/changelog
tags/libcommons-dbcp-java/1.4-4/debian/compat
tags/libcommons-dbcp-java/1.4-4/debian/control
tags/libcommons-dbcp-java/1.4-4/debian/copyright
tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms
tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules
tags/libcommons-dbcp-java/1.4-4/debian/maven.properties
tags/libcommons-dbcp-java/1.4-4/debian/maven.rules
tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh
tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch
tags/libcommons-dbcp-java/1.4-4/debian/patches/series
tags/libcommons-dbcp-java/1.4-4/debian/rules
Log:
[svn-buildpackage] Tagging libcommons-dbcp-java 1.4-4
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/README.source
===================================================================
--- trunk/libcommons-dbcp-java/debian/README.source 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/README.source 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,9 +0,0 @@
-Information about libcommons-dbcp-java
-------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
Copied: tags/libcommons-dbcp-java/1.4-4/debian/README.source (from rev 17852, trunk/libcommons-dbcp-java/debian/README.source)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/README.source (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/README.source 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,9 @@
+Information about libcommons-dbcp-java
+--------------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/TODO
===================================================================
--- trunk/libcommons-dbcp-java/debian/TODO 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/TODO 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1 +0,0 @@
-- build and run tests
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/changelog 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,181 +0,0 @@
-libcommons-dbcp-java (1.4-3) unstable; urgency=low
-
- * Team upload.
- * Apply patch from James Page that:
- - fixes FTBFS with Openjdk-7
- - Bumps geronimo-jta (build-)dependencies
- (Closes: #678167)
- * Remove Michael Koch from uploaders - Thanks for you work on
- this package so far. (Closes: #654051)
-
- -- Niels Thykier <niels at thykier.net> Tue, 19 Jun 2012 20:20:28 +0200
-
-libcommons-dbcp-java (1.4-2) unstable; urgency=low
-
- * Team upload.
- * Switch to source format 3.0.
- * Remove Java runtime from Depends.
- * Update Standards-Version: 3.9.1.
- * Use Maven to build the package.
-
- -- Torsten Werner <twerner at debian.org> Sun, 11 Sep 2011 17:15:36 +0200
-
-libcommons-dbcp-java (1.4-1) unstable; urgency=low
-
- * New upstream release:
- * Use commons-collections 3.x:
- - Build-Depends and Depends on libcommons-collection3-java
- - Update classpath in DEB_JARS from debian/rules
- - Fix transformation in debian/maven.rules
- * Remove Arnaud Vandyck from Uploaders
- * Javadoc:
- - Build-Depends on default-jdk-doc
- - Link generated Javadoc with it
- - libcommons-dbcp-java-doc now Recommends default-jdk-doc
- * Rewrite debian/watch and debian/orig-tar.sh to work with upstream
- stable release instead of svn snapshot.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Feb 2010 22:50:18 +0100
-
-libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low
-
- * New upstream SVN snapshot (r828639)
- * Update my email address
- * Bumped debhelper version to 7
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 23 Oct 2009 22:44:57 +0200
-
-libcommons-dbcp-java (1.3~svn803474-1) unstable; urgency=low
-
- [ Emmanuel Bourg ]
- * Update of the URLs
- * Rename Jakarta Commons to Apache Commons
- * debian/copyright: Switch to Apache License 2.0. Closes: #532888.
-
- [ Damien Raude-Morvan ]
- * New upstream SVN snapshot (r803474).
- - Fix FTBFS when using OpenJDK-6 (JDBC4 API) (Closes: #539179)
- - Add Build-Depends and Suggests on glassfish-javaee
- * Add myself as Uploaders
- * Bump Debhelper to 5
- * Use default-jdk/jre:
- - Build-Depends on default-jdk
- - Depends on default-jre-headless
- - Use /usr/lib/jvm/default-java as JAVA_HOME
- * Updated Standards-Version to 3.8.3:
- - Change section to "java"
- - Include a get-orig-source target
- - Add Homepage field
- * Remove useless dirs/links debhelper files
- * Split Javadoc API in a -doc package
- * Use quilt as patch system
- * Maven POMs:
- - Add a Build-Depends-Indep dependency on maven-repo-helper
- - Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 18 Aug 2009 21:04:39 +0200
-
-libcommons-dbcp-java (1.2.2-1) unstable; urgency=low
-
- * New upstream release
- * Added watch file
-
- -- Michael Koch <konqueror at gmx.de> Tue, 19 Jun 2007 15:58:41 +0200
-
-libcommons-dbcp-java (1.2.1-5) unstable; urgency=low
-
- * Merge from Ubuntu.
- * Fixed Depends of libcommons-dbcp-java to allow all Java runtimes to be
- used.
- * Moved debhelper and cdbs to from Builds-Depends-Indep to Build-Depends.
- * Added myself to Uploaders and removed Wolfgang.
- * Updated Standards-Version to 3.7.2.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 09 Jun 2007 12:23:34 -0100
-
-libcommons-dbcp-java (1.2.1-4ubuntu1) feisty; urgency=low
-
- * Re-sync with Debian. Changes retained:
- * Depend java-gcj-compat rather than java runtimes
-
- -- Barry deFreese <bddebian at comcast.net> Fri, 26 Jan 2007 19:13:45 -0500
-
-libcommons-dbcp-java (1.2.1-4) unstable; urgency=low
-
- * kaffe compiler transition
- + Removed build compiler jikes setting in debian/rules
- + Build-Depend only on kaffe
- * Standards-version 3.6.2 (no changes)
- * Depend on kaffe | java1-runtime | java2-runtime
- * Bumped debhelper version to fix linda error
- * Added myself to uploaders
-
- -- Wolfgang Baer <WBaer at gmx.de> Sun, 15 Jan 2006 16:45:00 +0100
-
-libcommons-dbcp-java (1.2.1-3) unstable; urgency=low
-
- * libant1.6-java to ant transition
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 19:41:10 +0200
-
-libcommons-dbcp-java (1.2.1-2) unstable; urgency=low
-
- * built with kaffe
- * now build the javadoc (closes: #234640).
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 28 Feb 2005 11:50:22 +0100
-
-libcommons-dbcp-java (1.2.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- Arnaud Vandyck <avdyk at debian.org> Sun, 11 Jul 2004 20:09:12 +0200
-
-libcommons-dbcp-java (1.0-6) unstable; urgency=low
-
- * added cdbs, jikes and libant1.5-java, thanks to Goswin Brederlow
- (closes: #258684)
- * now build with sablevm
- * updated standard to 3.6.1 (nothing to change)
- * no more documentation at the moment
-
- -- Arnaud Vandyck <avdyk at debian.org> Sun, 11 Jul 2004 19:54:00 +0200
-
-libcommons-dbcp-java (1.0-5) unstable; urgency=low
-
- * Move to main! c-pool and c-collections are now in main.
- * debian/rules (clean): now clean the doc/api directory
-
- -- Arnaud Vandyck <avdyk at debian.org> Thu, 8 Apr 2004 17:04:32 +0200
-
-libcommons-dbcp-java (1.0-4) unstable; urgency=low
-
- * added the java2-runtime dependency to let the choice to the user,
- thanks to ADFH (?! ;) (closes: #233648).
-
- -- Arnaud Vandyck <avdyk at debian.org> Thu, 19 Feb 2004 12:02:34 +0100
-
-libcommons-dbcp-java (1.0-3) unstable; urgency=low
-
- * Removed the java2 dependency.
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 16 Feb 2004 15:51:50 +0100
-
-libcommons-dbcp-java (1.0-2) unstable; urgency=low
-
- * debian/rules: now build with cdbs and kaffe 1:1.1.3
- * debian/control:
- - changed the maintainer field and me to the uploaders with my debian
- email
- - (Build-Depends-Indep): added libcommons-collections-java
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 10 Jan 2004 18:14:37 +0100
-
-libcommons-dbcp-java (1.0-1) unstable; urgency=low
-
- * Initial Release (closes: #188574).
-
- -- Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> Sat, 12 Jul 2003 11:33:30 +0200
-
Copied: tags/libcommons-dbcp-java/1.4-4/debian/changelog (from rev 17855, trunk/libcommons-dbcp-java/debian/changelog)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/changelog (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/changelog 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,196 @@
+libcommons-dbcp-java (1.4-4) unstable; urgency=medium
+
+ * Enabled the unit tests
+ * debian/control:
+ - Removed the unused build dependency on libclirr-maven-plugin-java
+ - Suggest the optional Maven dependencies instead of recommending them
+ - Standards-Version updated to 3.9.5 (no changes)
+ - Use canonical URLs for the Vcs-* fields
+ * Install the upstream changelog
+ * Use XZ compression for the upstream tarball
+ * Switch to debhelper level 9
+ * debian/copyright: Updated to the Copyright Format 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 11 Mar 2014 00:06:17 +0100
+
+libcommons-dbcp-java (1.4-3) unstable; urgency=low
+
+ * Team upload.
+ * Apply patch from James Page that:
+ - fixes FTBFS with Openjdk-7
+ - Bumps geronimo-jta (build-)dependencies
+ (Closes: #678167)
+ * Remove Michael Koch from uploaders - Thanks for you work on
+ this package so far. (Closes: #654051)
+
+ -- Niels Thykier <niels at thykier.net> Tue, 19 Jun 2012 20:20:28 +0200
+
+libcommons-dbcp-java (1.4-2) unstable; urgency=low
+
+ * Team upload.
+ * Switch to source format 3.0.
+ * Remove Java runtime from Depends.
+ * Update Standards-Version: 3.9.1.
+ * Use Maven to build the package.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 11 Sep 2011 17:15:36 +0200
+
+libcommons-dbcp-java (1.4-1) unstable; urgency=low
+
+ * New upstream release:
+ * Use commons-collections 3.x:
+ - Build-Depends and Depends on libcommons-collection3-java
+ - Update classpath in DEB_JARS from debian/rules
+ - Fix transformation in debian/maven.rules
+ * Remove Arnaud Vandyck from Uploaders
+ * Javadoc:
+ - Build-Depends on default-jdk-doc
+ - Link generated Javadoc with it
+ - libcommons-dbcp-java-doc now Recommends default-jdk-doc
+ * Rewrite debian/watch and debian/orig-tar.sh to work with upstream
+ stable release instead of svn snapshot.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Feb 2010 22:50:18 +0100
+
+libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low
+
+ * New upstream SVN snapshot (r828639)
+ * Update my email address
+ * Bumped debhelper version to 7
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 23 Oct 2009 22:44:57 +0200
+
+libcommons-dbcp-java (1.3~svn803474-1) unstable; urgency=low
+
+ [ Emmanuel Bourg ]
+ * Update of the URLs
+ * Rename Jakarta Commons to Apache Commons
+ * debian/copyright: Switch to Apache License 2.0. Closes: #532888.
+
+ [ Damien Raude-Morvan ]
+ * New upstream SVN snapshot (r803474).
+ - Fix FTBFS when using OpenJDK-6 (JDBC4 API) (Closes: #539179)
+ - Add Build-Depends and Suggests on glassfish-javaee
+ * Add myself as Uploaders
+ * Bump Debhelper to 5
+ * Use default-jdk/jre:
+ - Build-Depends on default-jdk
+ - Depends on default-jre-headless
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ * Updated Standards-Version to 3.8.3:
+ - Change section to "java"
+ - Include a get-orig-source target
+ - Add Homepage field
+ * Remove useless dirs/links debhelper files
+ * Split Javadoc API in a -doc package
+ * Use quilt as patch system
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 18 Aug 2009 21:04:39 +0200
+
+libcommons-dbcp-java (1.2.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added watch file
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 19 Jun 2007 15:58:41 +0200
+
+libcommons-dbcp-java (1.2.1-5) unstable; urgency=low
+
+ * Merge from Ubuntu.
+ * Fixed Depends of libcommons-dbcp-java to allow all Java runtimes to be
+ used.
+ * Moved debhelper and cdbs to from Builds-Depends-Indep to Build-Depends.
+ * Added myself to Uploaders and removed Wolfgang.
+ * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 09 Jun 2007 12:23:34 -0100
+
+libcommons-dbcp-java (1.2.1-4ubuntu1) feisty; urgency=low
+
+ * Re-sync with Debian. Changes retained:
+ * Depend java-gcj-compat rather than java runtimes
+
+ -- Barry deFreese <bddebian at comcast.net> Fri, 26 Jan 2007 19:13:45 -0500
+
+libcommons-dbcp-java (1.2.1-4) unstable; urgency=low
+
+ * kaffe compiler transition
+ + Removed build compiler jikes setting in debian/rules
+ + Build-Depend only on kaffe
+ * Standards-version 3.6.2 (no changes)
+ * Depend on kaffe | java1-runtime | java2-runtime
+ * Bumped debhelper version to fix linda error
+ * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 15 Jan 2006 16:45:00 +0100
+
+libcommons-dbcp-java (1.2.1-3) unstable; urgency=low
+
+ * libant1.6-java to ant transition
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 19:41:10 +0200
+
+libcommons-dbcp-java (1.2.1-2) unstable; urgency=low
+
+ * built with kaffe
+ * now build the javadoc (closes: #234640).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 28 Feb 2005 11:50:22 +0100
+
+libcommons-dbcp-java (1.2.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sun, 11 Jul 2004 20:09:12 +0200
+
+libcommons-dbcp-java (1.0-6) unstable; urgency=low
+
+ * added cdbs, jikes and libant1.5-java, thanks to Goswin Brederlow
+ (closes: #258684)
+ * now build with sablevm
+ * updated standard to 3.6.1 (nothing to change)
+ * no more documentation at the moment
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sun, 11 Jul 2004 19:54:00 +0200
+
+libcommons-dbcp-java (1.0-5) unstable; urgency=low
+
+ * Move to main! c-pool and c-collections are now in main.
+ * debian/rules (clean): now clean the doc/api directory
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 8 Apr 2004 17:04:32 +0200
+
+libcommons-dbcp-java (1.0-4) unstable; urgency=low
+
+ * added the java2-runtime dependency to let the choice to the user,
+ thanks to ADFH (?! ;) (closes: #233648).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 19 Feb 2004 12:02:34 +0100
+
+libcommons-dbcp-java (1.0-3) unstable; urgency=low
+
+ * Removed the java2 dependency.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 16 Feb 2004 15:51:50 +0100
+
+libcommons-dbcp-java (1.0-2) unstable; urgency=low
+
+ * debian/rules: now build with cdbs and kaffe 1:1.1.3
+ * debian/control:
+ - changed the maintainer field and me to the uploaders with my debian
+ email
+ - (Build-Depends-Indep): added libcommons-collections-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 10 Jan 2004 18:14:37 +0100
+
+libcommons-dbcp-java (1.0-1) unstable; urgency=low
+
+ * Initial Release (closes: #188574).
+
+ -- Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> Sat, 12 Jul 2003 11:33:30 +0200
+
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/compat
===================================================================
--- trunk/libcommons-dbcp-java/debian/compat 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/compat 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1 +0,0 @@
-7
Copied: tags/libcommons-dbcp-java/1.4-4/debian/compat (from rev 17852, trunk/libcommons-dbcp-java/debian/compat)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/compat (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/compat 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1 @@
+9
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/control 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,53 +0,0 @@
-Source: libcommons-dbcp-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-javadoc-plugin-java, libcommons-pool-java,
- default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java
-Standards-Version: 3.9.1
-Homepage: http://commons.apache.org/dbcp/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-dbcp-java/
-
-Package: libcommons-dbcp-java
-Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
-Suggests: libcommons-dbcp-java-doc
-Description: Database Connection Pooling Services
- The DBCP package provides database connection pooling services. The
- following features are supported
- .
- * DataSource and Driver interfaces to the pool.
- * Support for arbitrary sources of the underlying Connections.
- * Integration with arbitrary org.apache.commons.pool.ObjectPool
- implementations.
- * Support for Connection validation, expiration, etc.
- * Support for PreparedStatement pooling.
- * XML configuration.
- .
- This is a part of the Apache Commons Project.
-
-Package: libcommons-dbcp-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libcommons-dbcp-java
-Description: Database Connection Pooling Services - documentation
- The DBCP package provides database connection pooling services. The
- following features are supported
- .
- * DataSource and Driver interfaces to the pool.
- * Support for arbitrary sources of the underlying Connections.
- * Integration with arbitrary org.apache.commons.pool.ObjectPool
- implementations.
- * Support for Connection validation, expiration, etc.
- * Support for PreparedStatement pooling.
- * XML configuration.
- .
- This is a part of the Apache Commons Project.
- .
- This package contains Javadoc API Documentation of Commons DBCP.
Copied: tags/libcommons-dbcp-java/1.4-4/debian/control (from rev 17853, trunk/libcommons-dbcp-java/debian/control)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/control (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/control 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,58 @@
+Source: libcommons-dbcp-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: default-jdk-doc,
+ junit,
+ libcommons-pool-java,
+ libcommons-pool-java-doc,
+ libgeronimo-jta-1.1-spec-java,
+ libmaven-javadoc-plugin-java,
+ libtomcat7-java
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-dbcp-java/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-dbcp-java/
+Homepage: http://commons.apache.org/dbcp/
+
+Package: libcommons-dbcp-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: libcommons-dbcp-java-doc, ${maven:OptionalDepends}
+Description: Database Connection Pooling Services
+ The DBCP package provides database connection pooling services. The
+ following features are supported
+ .
+ * DataSource and Driver interfaces to the pool.
+ * Support for arbitrary sources of the underlying Connections.
+ * Integration with arbitrary org.apache.commons.pool.ObjectPool
+ implementations.
+ * Support for Connection validation, expiration, etc.
+ * Support for PreparedStatement pooling.
+ * XML configuration.
+ .
+ This is a part of the Apache Commons Project.
+
+Package: libcommons-dbcp-java-doc
+Architecture: all
+Section: doc
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libcommons-dbcp-java
+Description: Database Connection Pooling Services - documentation
+ The DBCP package provides database connection pooling services. The
+ following features are supported
+ .
+ * DataSource and Driver interfaces to the pool.
+ * Support for arbitrary sources of the underlying Connections.
+ * Integration with arbitrary org.apache.commons.pool.ObjectPool
+ implementations.
+ * Support for Connection validation, expiration, etc.
+ * Support for PreparedStatement pooling.
+ * XML configuration.
+ .
+ This is a part of the Apache Commons Project.
+ .
+ This package contains Javadoc API Documentation of Commons DBCP.
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/copyright
===================================================================
--- trunk/libcommons-dbcp-java/debian/copyright 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/copyright 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,26 +0,0 @@
-This package was debianized by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> on
-Sat, 5 Apr 2003 17:48:00 +0200.
-
-It was downloaded from http://commons.apache.org/dbcp/
-
-Upstream Authors: Morgan Delagrange,
- Geir Magnusson,
- Craig McClanahan,
- John McNally,
- Martin Poeschl <mpoeschl at marmot.at>,
- Rodney Waldhoff,
- David Weinrich,
- Dirk Verbeeck,
- Yoav Shapira <yoavs at apache.org>,
- Phil Steitz,
- Jörg Schaible <joerg.schaible at gmx.de>,
- Todd Carmichael <toddc at concur.com>,
- Wayne Woodfield,
- Dain Sundstrom <dain at apache.org>
-
-Copyright: © 2001-2008 The Apache Software Foundation
-
-License: Apache 2.0
-
- On Debian systems the full text of the Apache License can be found
- in `/usr/share/common-licenses/Apache-2.0'.
Copied: tags/libcommons-dbcp-java/1.4-4/debian/copyright (from rev 17855, trunk/libcommons-dbcp-java/debian/copyright)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/copyright (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/copyright 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,15 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Commons DBCP
+Source: http://commons.apache.org/dbcp/
+
+Files: *
+Copyright: 2001-2010, The Apache Software Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2003-2005, Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,26 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM or
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar
-# it will be installed with mh_install.
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-# temporarily for certain artifacts such as Javadoc jars.
-#
-pom.xml --no-parent --has-package-version --java-lib
Copied: tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms (from rev 17852, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/libcommons-dbcp-java.poms 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version --java-lib
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.ignoreRules 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,28 +0,0 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-# junit junit jar s/3\\..*/3.x/
-
-commons-logging commons-logging * * * *
-junit junit * * * *
-org.apache.geronimo.modules geronimo-transaction * * * *
-org.apache.maven.plugins maven-assembly-plugin * * * *
-org.apache.maven.plugins maven-changes-plugin * * * *
-org.apache.maven.plugins maven-checkstyle-plugin * * * *
-org.apache.maven.plugins maven-pmd-plugin * * * *
-org.apache.maven.plugins maven-surefire-plugin * * * *
-org.codehaus.mojo cobertura-maven-plugin * * * *
-org.codehaus.mojo findbugs-maven-plugin * * * *
-tomcat naming-common * * * *
-tomcat naming-java * * * *
Copied: tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules (from rev 17853, trunk/libcommons-dbcp-java/debian/maven.ignoreRules)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.ignoreRules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,27 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
+commons-logging commons-logging * * * *
+org.apache.geronimo.modules geronimo-transaction * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.codehaus.mojo clirr-maven-plugin * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+tomcat naming-java * * * *
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/maven.properties
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.properties 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.properties 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,5 +0,0 @@
-# Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
-
-maven.test.skip=true
Copied: tags/libcommons-dbcp-java/1.4-4/debian/maven.properties (from rev 17853, trunk/libcommons-dbcp-java/debian/maven.properties)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/maven.properties (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.properties 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/maven.rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.rules 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.rules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,19 +0,0 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\\..*/3.x/
-
-commons-dbcp commons-dbcp jar s/.*/debian/ * *
Copied: tags/libcommons-dbcp-java/1.4-4/debian/maven.rules (from rev 17853, trunk/libcommons-dbcp-java/debian/maven.rules)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/maven.rules (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/maven.rules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,21 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+commons-dbcp commons-dbcp jar s/.*/debian/ * *
+junit junit jar s/.*/3.x/ * *
+s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/debian/ * *
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-dbcp-java/debian/orig-tar.sh 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-# $2 version
-# $3 upstream tarball
-
-TAR=../libcommons-dbcp-java_$2.orig.tar.gz
-DIR=libcommons-dbcp-java-$2.orig
-
-# From SVN
-#VERSION=`echo $2 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
-#REVISION=HEAD
-#REVISION=`echo $2 | sed -e 's/.*svn//'`
-#svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR
-
-# From Tarball
-tar xvzf $3
-mv commons-dbcp-* $DIR
-
-# Repack
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
-
-exit 0
Copied: tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh (from rev 17852, trunk/libcommons-dbcp-java/debian/orig-tar.sh)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/orig-tar.sh 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+# $2 version
+# $3 upstream tarball
+
+TAR=../libcommons-dbcp-java_$2.orig.tar.xz
+DIR=libcommons-dbcp-java-$2.orig
+
+# From SVN
+#VERSION=`echo $2 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
+#REVISION=HEAD
+#REVISION=`echo $2 | sed -e 's/.*svn//'`
+#svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR
+
+# From Tarball
+tar xvzf $3
+mv commons-dbcp-* $DIR
+
+# Repack
+XZ_OPT=--best tar -c -J -f $TAR $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,459 +0,0 @@
-Description: Compatibility patch for OpenJDK7
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=796638
-Author: Pavel Tisnovsky <ptisnovs at redhat.com>
-
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-06-06 15:30:38.106421672 +0100
-@@ -24,10 +24,12 @@
- import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.Collections;
-+import java.util.logging.Logger;
- import java.sql.Connection;
- import java.sql.Driver;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.DataSource;
-
- import org.apache.commons.pool.KeyedObjectPoolFactory;
-@@ -1579,4 +1581,10 @@
- logWriter.println(message);
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-06-06 15:30:38.106421672 +0100
-@@ -19,10 +19,12 @@
-
- import java.util.Hashtable;
- import java.util.Properties;
-+import java.util.logging.Logger;
- import java.io.PrintWriter;
- import java.io.Serializable;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.PooledConnection;
- import javax.sql.ConnectionPoolDataSource;
- import javax.naming.Name;
-@@ -719,4 +721,10 @@
- {
- _maxPreparedStatements = maxPreparedStatements;
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-06-06 15:30:38.106421672 +0100
-@@ -21,10 +21,12 @@
- import java.io.ObjectInputStream;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
- import java.util.NoSuchElementException;
-+import java.util.logging.Logger;
-
- import javax.naming.NamingException;
- import javax.naming.Reference;
-@@ -561,4 +563,10 @@
- CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
- return mgr == null ? null : (GenericObjectPool) mgr.getPool();
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-06-06 15:30:38.106421672 +0100
-@@ -21,6 +21,8 @@
- import java.io.ObjectInputStream;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-+import java.util.logging.Logger;
-
- import javax.naming.NamingException;
- import javax.naming.Reference;
-@@ -269,5 +271,11 @@
- throw new IOException("NamingException: " + e);
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-06-06 15:30:38.106421672 +0100
-@@ -37,6 +37,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link CallableStatement}.
-@@ -661,4 +662,14 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-06-06 15:30:38.110421690 +0100
-@@ -27,6 +27,7 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
-+import java.util.concurrent.Executor;
- import java.sql.ResultSet;
- /* JDBC_4_ANT_KEY_BEGIN */
- import java.sql.Array;
-@@ -40,6 +41,7 @@
- import java.util.Collections;
- import java.util.Properties;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link Connection}.
-@@ -678,5 +680,31 @@
- return null;
- }
- }
--/* JDBC_4_ANT_KEY_END */
-+ /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public int getNetworkTimeout() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void abort(Executor executor) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public String getSchema() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setSchema(String schema) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-+
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-06-06 15:30:38.110421690 +0100
-@@ -24,6 +24,7 @@
- import java.sql.RowIdLifetime;
- /* JDBC_4_ANT_KEY_END */
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link DatabaseMetaData}.
-@@ -1208,4 +1209,13 @@
-
- /* JDBC_4_ANT_KEY_END */
-
-+ /* This functionality is not implemented yet */
-+ public boolean generatedKeyAlwaysReturned() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-06-06 15:30:38.110421690 +0100
-@@ -34,6 +34,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link PreparedStatement}.
-@@ -402,4 +403,15 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-06-06 15:30:38.110421690 +0100
-@@ -40,6 +40,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link ResultSet}.
-@@ -1079,4 +1080,14 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-06-06 15:30:38.110421690 +0100
-@@ -22,6 +22,7 @@
- import java.sql.SQLException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- /**
-@@ -386,4 +387,15 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-06-06 15:30:38.110421690 +0100
-@@ -21,6 +21,7 @@
- import java.sql.Connection;
- import java.sql.ResultSet;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- import org.apache.commons.pool.KeyedObjectPool;
-@@ -123,4 +124,13 @@
- super.passivate();
- }
-
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-06-06 15:30:38.110421690 +0100
-@@ -21,6 +21,7 @@
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- import org.apache.commons.pool.KeyedObjectPool;
-@@ -137,4 +138,14 @@
- super.passivate();
- }
-
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-06-06 15:30:38.110421690 +0100
-@@ -21,8 +21,10 @@
- import java.sql.Connection;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-
- import java.util.NoSuchElementException;
-+import java.util.concurrent.Executor;
-
- import org.apache.commons.pool.KeyedObjectPool;
- import org.apache.commons.pool.KeyedPoolableObjectFactory;
-@@ -455,4 +457,30 @@
- return buf.toString();
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public int getNetworkTimeout() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void abort(Executor executor) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public String getSchema() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setSchema(String schema) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-+
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-06-06 15:30:38.110421690 +0100
-@@ -23,10 +23,12 @@
- import java.sql.DatabaseMetaData;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
- import java.util.Map;
- import java.util.NoSuchElementException;
-+import java.util.logging.Logger;
-
- import javax.sql.DataSource;
-
-@@ -437,4 +439,9 @@
- }
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-Index: libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java
-===================================================================
---- libcommons-dbcp-java.orig/src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-06-06 15:30:07.241314000 +0100
-+++ libcommons-dbcp-java/src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-06-06 15:30:38.110421690 +0100
-@@ -27,6 +27,7 @@
- import java.sql.DriverPropertyInfo;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
- import java.util.HashMap;
-@@ -34,6 +35,7 @@
- import java.util.NoSuchElementException;
- import java.util.Properties;
- import java.util.Set;
-+import java.util.logging.Logger;
-
- import org.apache.commons.jocl.JOCLContentHandler;
- import org.apache.commons.pool.ObjectPool;
-@@ -496,4 +498,10 @@
- }
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
Copied: tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch (from rev 17853, trunk/libcommons-dbcp-java/debian/patches/02_java7_compat.patch)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/patches/02_java7_compat.patch 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,573 @@
+Description: Compatibility patch for OpenJDK7
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=796638
+Author: Pavel Tisnovsky <ptisnovs at redhat.com>
+
+--- a/src/java/org/apache/commons/dbcp/BasicDataSource.java
++++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java
+@@ -24,10 +24,12 @@
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.Collections;
++import java.util.logging.Logger;
+ import java.sql.Connection;
+ import java.sql.Driver;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
+
+ import org.apache.commons.pool.KeyedObjectPoolFactory;
+@@ -1579,4 +1581,10 @@
+ logWriter.println(message);
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
++++ b/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
+@@ -19,10 +19,12 @@
+
+ import java.util.Hashtable;
+ import java.util.Properties;
++import java.util.logging.Logger;
+ import java.io.PrintWriter;
+ import java.io.Serializable;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.PooledConnection;
+ import javax.sql.ConnectionPoolDataSource;
+ import javax.naming.Name;
+@@ -719,4 +721,10 @@
+ {
+ _maxPreparedStatements = maxPreparedStatements;
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
++++ b/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
+@@ -21,10 +21,12 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+@@ -561,4 +563,10 @@
+ CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
+ return mgr == null ? null : (GenericObjectPool) mgr.getPool();
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
++++ b/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
+@@ -21,6 +21,8 @@
+ import java.io.ObjectInputStream;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+@@ -269,5 +271,11 @@
+ throw new IOException("NamingException: " + e);
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+
+--- a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
+@@ -37,6 +37,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link CallableStatement}.
+@@ -661,4 +662,14 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/java/org/apache/commons/dbcp/DelegatingConnection.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingConnection.java
+@@ -27,6 +27,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
++import java.util.concurrent.Executor;
+ import java.sql.ResultSet;
+ /* JDBC_4_ANT_KEY_BEGIN */
+ import java.sql.Array;
+@@ -40,6 +41,7 @@
+ import java.util.Collections;
+ import java.util.Properties;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link Connection}.
+@@ -678,5 +680,31 @@
+ return null;
+ }
+ }
+-/* JDBC_4_ANT_KEY_END */
++ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public String getSchema() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
++
+--- a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
+@@ -24,6 +24,7 @@
+ import java.sql.RowIdLifetime;
+ /* JDBC_4_ANT_KEY_END */
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link DatabaseMetaData}.
+@@ -1208,4 +1209,13 @@
+
+ /* JDBC_4_ANT_KEY_END */
+
++ /* This functionality is not implemented yet */
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
+@@ -34,6 +34,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link PreparedStatement}.
+@@ -402,4 +403,15 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
+@@ -40,6 +40,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLXML;
+ /* JDBC_4_ANT_KEY_END */
++import java.sql.SQLFeatureNotSupportedException;
+
+ /**
+ * A base delegating implementation of {@link ResultSet}.
+@@ -1079,4 +1080,14 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/java/org/apache/commons/dbcp/DelegatingStatement.java
++++ b/src/java/org/apache/commons/dbcp/DelegatingStatement.java
+@@ -22,6 +22,7 @@
+ import java.sql.SQLException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ /**
+@@ -386,4 +387,15 @@
+ }
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
++++ b/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
+@@ -21,6 +21,7 @@
+ import java.sql.Connection;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+@@ -123,4 +124,13 @@
+ super.passivate();
+ }
+
++ /* This functionality is not implemented yet */
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
++++ b/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
+@@ -21,6 +21,7 @@
+ import java.sql.PreparedStatement;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.List;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+@@ -137,4 +138,14 @@
+ super.passivate();
+ }
+
++ /* This functionality is not implemented yet */
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/java/org/apache/commons/dbcp/PoolingConnection.java
++++ b/src/java/org/apache/commons/dbcp/PoolingConnection.java
+@@ -21,8 +21,10 @@
+ import java.sql.Connection;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+
+ import java.util.NoSuchElementException;
++import java.util.concurrent.Executor;
+
+ import org.apache.commons.pool.KeyedObjectPool;
+ import org.apache.commons.pool.KeyedPoolableObjectFactory;
+@@ -455,4 +457,30 @@
+ return buf.toString();
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public String getSchema() throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
++ /* This functionality is not implemented yet */
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
++
+--- a/src/java/org/apache/commons/dbcp/PoolingDataSource.java
++++ b/src/java/org/apache/commons/dbcp/PoolingDataSource.java
+@@ -23,10 +23,12 @@
+ import java.sql.DatabaseMetaData;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Map;
+ import java.util.NoSuchElementException;
++import java.util.logging.Logger;
+
+ import javax.sql.DataSource;
+
+@@ -437,4 +439,9 @@
+ }
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+--- a/src/java/org/apache/commons/dbcp/PoolingDriver.java
++++ b/src/java/org/apache/commons/dbcp/PoolingDriver.java
+@@ -27,6 +27,7 @@
+ import java.sql.DriverPropertyInfo;
+ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.HashMap;
+@@ -34,6 +35,7 @@
+ import java.util.NoSuchElementException;
+ import java.util.Properties;
+ import java.util.Set;
++import java.util.logging.Logger;
+
+ import org.apache.commons.jocl.JOCLContentHandler;
+ import org.apache.commons.pool.ObjectPool;
+@@ -496,4 +498,10 @@
+ }
+ }
+ }
++
++ /* This functionality is not implemented yet */
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterStatement.java
++++ b/src/test/org/apache/commons/dbcp/TesterStatement.java
+@@ -296,4 +296,15 @@
+ throw new SQLException("Not implemented.");
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public void closeOnCompletion() throws SQLException {
++ }
++
++ @Override
++ public boolean isCloseOnCompletion() throws SQLException {
++ return false;
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
++++ b/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
+@@ -456,4 +456,18 @@
+ public void setNClob(String parameterName, Reader reader) throws SQLException {
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public <T> T getObject(int parameterIndex, Class<T> type)
++ throws SQLException {
++ return null;
++ }
++
++ @Override
++ public <T> T getObject(String parameterName, Class<T> type)
++ throws SQLException {
++ return null;
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
++++ b/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
+@@ -761,4 +761,18 @@
+ }
+
+ /* JDBC_4_ANT_KEY_END */
++
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
++ String tableNamePattern, String columnNamePattern)
++ throws SQLException {
++ return null;
++ }
++
++ @Override
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ return false;
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterResultSet.java
++++ b/src/test/org/apache/commons/dbcp/TesterResultSet.java
+@@ -969,4 +969,17 @@
+ throw new SQLException("Not implemented.");
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ @Override
++ public <T> T getObject(String columnLabel, Class<T> type)
++ throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/TesterDriver.java
++++ b/src/test/org/apache/commons/dbcp/TesterDriver.java
+@@ -116,6 +116,13 @@
+ return new DriverPropertyInfo[0];
+ }
+
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
++ }
++ /* JDBC_4_1_ANT_KEY_END */
++
+ protected static final String CONNECT_STRING = "jdbc:apache:commons:testdriver";
+
+ // version numbers
+--- a/src/test/org/apache/commons/dbcp/TesterConnection.java
++++ b/src/test/org/apache/commons/dbcp/TesterConnection.java
+@@ -334,4 +334,32 @@
+ throw new SQLException("Not implemented.");
+ }
+ /* JDBC_4_ANT_KEY_END */
++
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ @Override
++ public String getSchema() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ @Override
++ public void abort(java.util.concurrent.Executor executor) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ @Override
++ public void setNetworkTimeout(java.util.concurrent.Executor executor, int milliseconds)
++ throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ @Override
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
+--- a/src/test/org/apache/commons/dbcp/datasources/ConnectionPoolDataSourceProxy.java
++++ b/src/test/org/apache/commons/dbcp/datasources/ConnectionPoolDataSourceProxy.java
+@@ -80,4 +80,10 @@
+ return tpc;
+ }
+
++ /* JDBC_4_1_ANT_KEY_BEGIN */
++ @Override
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
++ }
++ /* JDBC_4_1_ANT_KEY_END */
+ }
Copied: tags/libcommons-dbcp-java/1.4-4/debian/patches/03_exclude-transactions-tests.patch (from rev 17853, trunk/libcommons-dbcp-java/debian/patches/03_exclude-transactions-tests.patch)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/patches/03_exclude-transactions-tests.patch (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/patches/03_exclude-transactions-tests.patch 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,26 @@
+Description: Ignores the tests using geronimo-transaction which isn't available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -272,6 +272,20 @@
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
++ <executions>
++ <execution>
++ <id>default-testCompile</id>
++ <phase>test-compile</phase>
++ <goals>
++ <goal>testCompile</goal>
++ </goals>
++ <configuration>
++ <testExcludes>
++ <exclude>**/managed/**</exclude>
++ </testExcludes>
++ </configuration>
++ </execution>
++ </executions>
+ </plugin>
+ </plugins>
+ </build>
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/patches/series
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/series 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/patches/series 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,2 +0,0 @@
-0001-configure-source-and-target-version-1.5.patch
-02_java7_compat.patch
Copied: tags/libcommons-dbcp-java/1.4-4/debian/patches/series (from rev 17853, trunk/libcommons-dbcp-java/debian/patches/series)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/patches/series (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/patches/series 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,3 @@
+0001-configure-source-and-target-version-1.5.patch
+02_java7_compat.patch
+03_exclude-transactions-tests.patch
Deleted: tags/libcommons-dbcp-java/1.4-4/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules 2014-03-10 02:21:19 UTC (rev 17851)
+++ tags/libcommons-dbcp-java/1.4-4/debian/rules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -1,9 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
Copied: tags/libcommons-dbcp-java/1.4-4/debian/rules (from rev 17852, trunk/libcommons-dbcp-java/debian/rules)
===================================================================
--- tags/libcommons-dbcp-java/1.4-4/debian/rules (rev 0)
+++ tags/libcommons-dbcp-java/1.4-4/debian/rules 2014-03-11 07:41:49 UTC (rev 17856)
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list