This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit ea050963f770e17162f1154c507e7deba4f10227 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 01:35:31 2015 +0100 Restored the Java 8 compatibility patch --- debian/changelog | 1 + debian/patches/java8-compatibility.patch | 145 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 147 insertions(+) diff --git a/debian/changelog b/debian/changelog index ef582ae..a908004 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ bnd (2.2.0-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches - Updated the Maven poms + * Restored the Java 8 compatibility patch * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Tue, 15 Dec 2015 22:34:41 +0100 diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch new file mode 100644 index 0000000..51e6e85 --- /dev/null +++ b/debian/patches/java8-compatibility.patch @@ -0,0 +1,145 @@ +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 +@@ -8,7 +8,7 @@ + import java.util.regex.*; + + import aQute.bnd.osgi.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.io.*; + + /** +--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java +@@ -11,7 +11,7 @@ + import java.util.zip.*; + + import aQute.bnd.version.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.io.*; + import aQute.service.reporter.*; + +--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java +@@ -38,7 +38,7 @@ + import aQute.bnd.service.*; + import aQute.bnd.version.*; + import aQute.bnd.version.Version; +-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/converter/Converter.java ++++ b/aQute.libg/src/aQute/lib/converter/Converter.java +@@ -5,7 +5,7 @@ + import java.util.concurrent.*; + import java.util.regex.*; + +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + + /** + * General Java type converter from an object to any type. Supports number +--- a/aQute.libg/src/aQute/lib/json/ByteArrayHandler.java ++++ b/aQute.libg/src/aQute/lib/json/ByteArrayHandler.java +@@ -5,7 +5,7 @@ + import java.util.*; + import java.util.regex.*; + +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.hex.*; + + /** +--- a/aQute.libg/src/aQute/lib/json/FileHandler.java ++++ b/aQute.libg/src/aQute/lib/json/FileHandler.java +@@ -4,7 +4,7 @@ + import java.lang.reflect.*; + import java.util.*; + +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + + public class FileHandler extends Handler { + +--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +@@ -37,7 +37,7 @@ + import aQute.bnd.service.action.*; + import aQute.bnd.version.*; + import aQute.configurable.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.collections.*; + import aQute.lib.filter.*; + import aQute.lib.getopt.*; +--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java +@@ -10,7 +10,7 @@ + import aQute.bnd.osgi.Descriptors.PackageRef; + import aQute.bnd.osgi.Descriptors.TypeRef; + import aQute.bnd.version.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.filter.*; + import aQute.lib.io.*; + import aQute.libg.cryptography.*; +--- a/aQute.libg/src/aQute/lib/collections/MultiMap.java ++++ b/aQute.libg/src/aQute/lib/collections/MultiMap.java +@@ -80,7 +80,7 @@ + } + return set.addAll(value); + } +- ++/* + public boolean remove(K key, V value) { + assert keyClass.isInstance(key); + assert valueClass.isInstance(value); +@@ -94,7 +94,7 @@ + remove(key); + return result; + } +- ++*/ + public boolean removeAll(K key, Collection<V> value) { + assert keyClass.isInstance(key); + List<V> set = get(key); +--- a/aQute.libg/src/aQute/lib/collections/SortedList.java ++++ b/aQute.libg/src/aQute/lib/collections/SortedList.java +@@ -467,4 +467,8 @@ + return (SortedSet<T>) empty; + } + ++ public java.util.Spliterator<T> spliterator() { ++ throw new UnsupportedOperationException(); ++ } ++ + } +--- 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.*,\ + org.junit.* +--- a/biz.aQute.launcher/bnd.bnd ++++ b/biz.aQute.launcher/bnd.bnd +@@ -10,6 +10,6 @@ + + Bundle-Version: 1.2.1.${tstamp} + javac.source = 1.5 +-javac.target = jsr14 ++javac.target = 1.5 + +-Premain-Class: aQute.launcher.agent.LauncherAgent +\ No newline at end of file ++Premain-Class: aQute.launcher.agent.LauncherAgent diff --git a/debian/patches/series b/debian/patches/series index 2184749..5b80862 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ FTBFS.patch implement-missing-methods.patch build-without-biz.aQute.repository-and-resolve.patch no-osgi.r5.patch +java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
