[pkg-java] r16650 - in trunk/libjboss-classloader-java/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2013-05-15 11:23:53 +0000 (Wed, 15 May 2013)
New Revision: 16650

Added:
   trunk/libjboss-classloader-java/debian/patches/
   trunk/libjboss-classloader-java/debian/patches/java7-compat.patch
   trunk/libjboss-classloader-java/debian/patches/series
Modified:
   trunk/libjboss-classloader-java/debian/changelog
Log:
Add compatibility patch to fix FTBFS with OpenJDK7. Thanks to James Page.


Modified: trunk/libjboss-classloader-java/debian/changelog
===================================================================
--- trunk/libjboss-classloader-java/debian/changelog	2013-05-15 11:08:12 UTC (rev 16649)
+++ trunk/libjboss-classloader-java/debian/changelog	2013-05-15 11:23:53 UTC (rev 16650)
@@ -1,3 +1,11 @@
+libjboss-classloader-java (2.0.6.GA-3) unstable; urgency=low
+
+  * Team upload.
+  * Add compatibility patch to fix FTBFS with OpenJDK7. Thanks to James Page
+    for providing it. (Closes: #684979)
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 15 May 2013 08:11:03 +0200
+
 libjboss-classloader-java (2.0.6.GA-2) unstable; urgency=low
 
   * Team upload.

Added: trunk/libjboss-classloader-java/debian/patches/java7-compat.patch
===================================================================
--- trunk/libjboss-classloader-java/debian/patches/java7-compat.patch	                        (rev 0)
+++ trunk/libjboss-classloader-java/debian/patches/java7-compat.patch	2013-05-15 11:23:53 UTC (rev 16650)
@@ -0,0 +1,20 @@
+Description: Compatibility Patch for Java 7
+ Avoiding:
+    error: name clash: suite(Class<?>) in IsolatedClassLoaderTest and suite(Class) \
+        in AbstractTestCaseWithSetup have the same erasure, \
+        yet neither hides the other
+ .
+ Class<?> and Class match in Java7 compiler semantics - so dropping the <?> is OK.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+--- a/classloader/src/main/java/org/jboss/classloader/test/support/IsolatedClassLoaderTest.java
++++ b/classloader/src/main/java/org/jboss/classloader/test/support/IsolatedClassLoaderTest.java
+@@ -58,7 +58,7 @@ public abstract class IsolatedClassLoade
+     * @param clazz the test class
+     * @return the test
+     */
+-   public static Test suite(Class<?> clazz)
++   public static Test suite(Class clazz)
+    {
+       return suite(clazz, false);
+    }

Added: trunk/libjboss-classloader-java/debian/patches/series
===================================================================
--- trunk/libjboss-classloader-java/debian/patches/series	                        (rev 0)
+++ trunk/libjboss-classloader-java/debian/patches/series	2013-05-15 11:23:53 UTC (rev 16650)
@@ -0,0 +1 @@
+java7-compat.patch