[pkg-java] r18096 - in trunk/bnd/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-29 12:19:52 +0000 (Tue, 29 Apr 2014)
New Revision: 18096

Added:
   trunk/bnd/debian/patches/java8-compatibility.diff
Modified:
   trunk/bnd/debian/changelog
   trunk/bnd/debian/patches/series
Log:
Fixed the compilation errors with Java 8



Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2014-04-29 04:41:33 UTC (rev 18095)
+++ trunk/bnd/debian/changelog	2014-04-29 12:19:52 UTC (rev 18096)
@@ -1,3 +1,9 @@
+bnd (1.50.0-8) UNRELEASED; urgency=medium
+
+  * Added a patch to fix the compilation errors with Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Apr 2014 14:05:29 +0200
+
 bnd (1.50.0-7) unstable; urgency=low
 
   * Install the Maven artifacts biz.aQute:annotation and biz.aQute:bnd

Added: trunk/bnd/debian/patches/java8-compatibility.diff
===================================================================
--- trunk/bnd/debian/patches/java8-compatibility.diff	                        (rev 0)
+++ trunk/bnd/debian/patches/java8-compatibility.diff	2014-04-29 12:19:52 UTC (rev 18096)
@@ -0,0 +1,74 @@
+Description: Fixes the compilation errors with Java 8
+Author: Emmanuel Bourg
+Forwarded: no
+--- a/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java
+@@ -7,7 +7,7 @@
+ import java.util.jar.*;
+ import java.util.regex.*;
+ 
+-import aQute.lib.base64.*;
++import aQute.lib.base64.Base64;
+ import aQute.lib.osgi.*;
+ 
+ /**
+--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java
++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java
+@@ -9,7 +9,7 @@
+ import java.util.regex.*;
+ import java.util.zip.*;
+ 
+-import aQute.lib.base64.*;
++import aQute.lib.base64.Base64;
+ import aQute.libg.reporter.*;
+ 
+ public class Jar implements Closeable {
+--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
+@@ -29,7 +29,7 @@
+ 
+ import aQute.bnd.annotation.*;
+ import aQute.bnd.service.*;
+-import aQute.lib.base64.*;
++import aQute.lib.base64.Base64;
+ import aQute.lib.collections.*;
+ import aQute.lib.filter.*;
+ import aQute.lib.hex.*;
+--- a/aQute.libg/src/aQute/lib/collections/MultiMap.java
++++ b/aQute.libg/src/aQute/lib/collections/MultiMap.java
+@@ -24,6 +24,7 @@
+ 		return set.addAll(value);
+ 	}
+ 	
++/*
+ 	public boolean remove( K key, V value ) {
+ 		Set<V> set = get(key);
+ 		if ( set == null) {
+@@ -34,6 +35,7 @@
+ 			remove(key);
+ 		return result;
+ 	}
++*/
+ 	
+ 	public boolean removeAll( K key, Collection<V> value ) {
+ 		Set<V> set = get(key);
+--- a/biz.aQute.junit/bnd.bnd
++++ b/biz.aQute.junit/bnd.bnd
+@@ -7,7 +7,7 @@
+ Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl
+ 
+ javac.source = 1.5
+-javac.target = jsr14
++javac.target = 1.5
+ Private-Package: aQute.junit.*,\
+ 	junit.framework
+ Export-Package: junit.framework; version=3.8
+--- a/biz.aQute.launcher/bnd.bnd
++++ b/biz.aQute.launcher/bnd.bnd
+@@ -11,4 +11,4 @@
+ 	
+ Bundle-Version: 1.0.0
+ javac.source = 1.5
+-javac.target = jsr14
+\ No newline at end of file
++javac.target = 1.5

Modified: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series	2014-04-29 04:41:33 UTC (rev 18095)
+++ trunk/bnd/debian/patches/series	2014-04-29 12:19:52 UTC (rev 18096)
@@ -7,3 +7,4 @@
 find_swt_jar.diff
 fix-encoding.diff
 ant-1.9-compatibility.diff
+java8-compatibility.diff