[SCM] OpenJPA: Apache implementation of the Java Persistence API (JPA) branch, master, updated. debian/2.0.0-1-7-g09af4cc

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit cbb74b5e1717241bf2b122a6d2665e2ed799d72d
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Mon Jun 25 20:32:16 2012 -0430

    Fix FTBFS with OpenJDK 7

diff --git a/debian/changelog b/debian/changelog
index 91048de..92a81ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ openjpa (2.0.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.9.1. No changes were required.
   * Include the complete text of BSD license in debian/copyright file.
+  * Fix FTBFS with OpenJDK 7.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 11 Nov 2010 21:20:58 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 25 Jun 2012 21:31:26 -0430
 
 openjpa (2.0.0-1) unstable; urgency=low
 
diff --git a/debian/patches/java7-compat.diff b/debian/patches/java7-compat.diff
new file mode 100644
index 0000000..b43cb79
--- /dev/null
+++ b/debian/patches/java7-compat.diff
@@ -0,0 +1,15 @@
+Description: FTBFS with Java7 as default-java due to an API change in Java's SQL libraries
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2012-06-25
+
+--- openjpa-2.0.0.orig/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
++++ openjpa-2.0.0/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
+@@ -112,4 +112,7 @@ public class DistributedDataSource exten
+         
+     }
+ 
++    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++        throw new UnsupportedOperationException("getParentLogger");
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..70a6c86
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java7-compat.diff

-- 
OpenJPA: Apache implementation of the Java Persistence API (JPA)