This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 65cd3bee4b647688c0bce67b83069dbc6690890f Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 15:49:44 2015 +0100 Refreshed the patches --- debian/changelog | 8 + debian/patches/FTBFS.patch | 342 --------------------- ...-without-biz.aQute.repository-and-resolve.patch | 45 --- debian/patches/display_bsn_on_missing_bundle.patch | 2 +- debian/patches/embedded-repo.patch | 8 +- debian/patches/implement-missing-methods.patch | 20 +- debian/patches/java8-compatibility.patch | 36 ++- debian/patches/no-ee.j2se.patch | 36 +-- debian/patches/no-osgi.r5.patch | 25 +- debian/patches/no_ee_minimum.patch | 33 +- debian/patches/series | 3 - 11 files changed, 73 insertions(+), 485 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ab2da3..0918c2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bnd (2.3.0-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Wed, 16 Dec 2015 12:54:06 +0100 + bnd (2.2.0-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/FTBFS.patch b/debian/patches/FTBFS.patch deleted file mode 100644 index 8ba05e3..0000000 --- a/debian/patches/FTBFS.patch +++ /dev/null @@ -1,342 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 15 May 2015 15:04:06 +0200 -Subject: FTBFS - -This patch can be dropped as soon as version 2.4.0 of bnd is packaged for -Debian. Those changes were backported from 2.4.0. - -Forwarded: not-needed ---- - .../src/aQute/launcher/minifw/Context.java | 99 +++++++++++++++------- - .../src/aQute/launcher/minifw/MiniFramework.java | 74 ++++++++++++---- - 2 files changed, 126 insertions(+), 47 deletions(-) - -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -index 3761a8a..8c5111f 100644 ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -@@ -2,6 +2,7 @@ package aQute.launcher.minifw; - - import java.io.*; - import java.net.*; -+import java.security.cert.*; - import java.util.*; - import java.util.jar.*; - import java.util.zip.*; -@@ -18,16 +19,19 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - private TreeSet<String> paths; - private File jarFile; - -- class Dict extends Dictionary<String,Object> { -+ class Dict extends Dictionary<String,String> { - - @Override -- public Enumeration<Object> elements() { -- return Collections.enumeration(manifest.getMainAttributes().values()); -+ public Enumeration<String> elements() { -+ @SuppressWarnings("unchecked") -+ Enumeration<String> enumeration = (Enumeration) Collections.enumeration(manifest -+ .getMainAttributes().values()); -+ return enumeration; - } - - @Override -- public Object get(Object key) { -- Object o = manifest.getMainAttributes().getValue((String) key); -+ public String get(Object key) { -+ String o = manifest.getMainAttributes().getValue((String) key); - return o; - } - -@@ -47,12 +51,12 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - } - - @Override -- public Object put(String key, Object value) { -+ public String put(String key, String value) { - throw new UnsupportedOperationException(); - } - - @Override -- public Object remove(Object key) { -+ public String remove(Object key) { - throw new UnsupportedOperationException(); - } - -@@ -94,15 +98,15 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - return getResource(path); - } - -- public Enumeration< ? > getEntryPaths(String path) { -+ public Enumeration<String> getEntryPaths(String path) { - throw new UnsupportedOperationException(); - } - -- public Dictionary<String,Object> getHeaders() { -+ public Dictionary<String,String> getHeaders() { - return new Dict(); - } - -- public Dictionary<String,Object> getHeaders(String locale) { -+ public Dictionary<String,String> getHeaders(String locale) { - return new Dict(); - } - -@@ -186,7 +190,7 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - return null; - } - -- public Map< ? , ? > getSignerCertificates(int signersType) { -+ public Map<X509Certificate,List<X509Certificate>> getSignerCertificates(int signersType) { - throw new UnsupportedOperationException(); - } - -@@ -195,11 +199,11 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - } - - public String getSymbolicName() { -- return ((String) getHeaders().get("Bundle-SymbolicName")).trim(); -+ return getHeaders().get(aQute.bnd.osgi.Constants.BUNDLE_SYMBOLICNAME).trim(); - } - - public Version getVersion() { -- String v = ((String) getHeaders().get("Bundle-Version")).trim(); -+ String v = getHeaders().get(aQute.bnd.osgi.Constants.BUNDLE_VERSION).trim(); - if (v == null) - return new Version("0"); - return new Version(v); -@@ -281,15 +285,12 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - return fw.getProperty(key); - } - -- public Object getService(ServiceReference reference) { -- throw new UnsupportedOperationException(); -- } - -- public ServiceReference getServiceReference(String clazz) { -+ public ServiceReference<?> getServiceReference(String clazz) { - return null; - } - -- public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { -+ public ServiceReference<?>[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { - return null; - } - -@@ -301,13 +302,6 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - return fw.installBundle(location, input); - } - -- public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { -- throw new UnsupportedOperationException(); -- } -- -- public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) { -- throw new UnsupportedOperationException(); -- } - - public void removeBundleListener(BundleListener listener) { - throw new UnsupportedOperationException(); -@@ -321,12 +315,59 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu - throw new UnsupportedOperationException(); - } - -- public boolean ungetService(ServiceReference reference) { -- throw new UnsupportedOperationException(); -- } -- - @Override - public String toString() { - return id + " " + location; - } -+ -+ public int compareTo(Bundle var0) { -+ // TODO Auto-generated method stub -+ return 0; -+ } -+ -+ public ServiceRegistration< ? > registerService(String[] clazzes, Object service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public ServiceRegistration< ? > registerService(String clazz, Object service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) -+ throws InvalidSyntaxException { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> S getService(ServiceReference<S> reference) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public boolean ungetService(ServiceReference< ? > reference) { -+ // TODO Auto-generated method stub -+ return false; -+ } -+ -+ public Bundle getBundle(String location) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <A> A adapt(Class<A> type) { -+ // TODO Auto-generated method stub -+ return null; -+ } - } -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -index 7d910c5..67e9348 100644 ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -@@ -2,6 +2,7 @@ package aQute.launcher.minifw; - - import java.io.*; - import java.net.*; -+import java.security.cert.*; - import java.util.*; - - import org.osgi.framework.*; -@@ -55,7 +56,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - return loader.getResource(path); - } - -- public Enumeration< ? > getEntryPaths(String path) { -+ public Enumeration< String > getEntryPaths(String path) { - throw new UnsupportedOperationException(); - } - -@@ -63,7 +64,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - return new Hashtable<String,String>(); - } - -- public Dictionary< ? , ? > getHeaders(String locale) { -+ public Dictionary< String , String > getHeaders(String locale) { - throw new UnsupportedOperationException(); - } - -@@ -180,7 +181,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - } - } - -- public Enumeration< ? > findEntries(String path, String filePattern, boolean recurse) { -+ public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) { - throw new UnsupportedOperationException(); - } - -@@ -192,7 +193,7 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - throw new UnsupportedOperationException(); - } - -- public Map< ? , ? > getSignerCertificates(int signersType) { -+ public Map<X509Certificate,List<X509Certificate>> getSignerCertificates(int signersType) { - throw new UnsupportedOperationException(); - } - -@@ -232,9 +233,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - throw new UnsupportedOperationException(); - } - -- public Object getService(ServiceReference reference) { -- return null; -- } - - public ServiceReference getServiceReference(String clazz) { - return null; -@@ -244,13 +242,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - return null; - } - -- public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { -- throw new UnsupportedOperationException(); -- } -- -- public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) { -- throw new UnsupportedOperationException(); -- } - - public void removeBundleListener(BundleListener listener) { - // ok -@@ -264,10 +255,6 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - // ok - } - -- public boolean ungetService(ServiceReference reference) { -- throw new UnsupportedOperationException(); -- } -- - @Override - public String toString() { - return "Mini framework"; -@@ -287,4 +274,55 @@ public class MiniFramework implements Framework, Bundle, BundleContext { - throw new ClassNotFoundException(name); - } - } -+ -+ public int compareTo(Bundle var0) { -+ // TODO Auto-generated method stub -+ return 0; -+ } -+ -+ public ServiceRegistration< ? > registerService(String[] clazzes, Object service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public ServiceRegistration< ? > registerService(String clazz, Object service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) -+ throws InvalidSyntaxException { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <S> S getService(ServiceReference<S> reference) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public boolean ungetService(ServiceReference< ? > reference) { -+ // TODO Auto-generated method stub -+ return false; -+ } -+ -+ public Bundle getBundle(String location) { -+ // TODO Auto-generated method stub -+ return null; -+ } -+ -+ public <A> A adapt(Class<A> type) { -+ // TODO Auto-generated method stub -+ return null; -+ } - } diff --git a/debian/patches/build-without-biz.aQute.repository-and-resolve.patch b/debian/patches/build-without-biz.aQute.repository-and-resolve.patch deleted file mode 100644 index 582dc14..0000000 --- a/debian/patches/build-without-biz.aQute.repository-and-resolve.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 18 May 2015 15:19:00 +0200 -Subject: build without biz.aQute.repository and resolve - -Build without repository and resolve modules. On Debian systems dependencies -can be resolved with packaging tools like apt-get. These modules are optional -and also need additional build-dependencies like jetty. - -Forwarded: not-needed ---- - build.xml | 4 ---- - dist/bnd.bnd | 2 +- - 2 files changed, 1 insertion(+), 5 deletions(-) - ---- a/build.xml -+++ b/build.xml -@@ -20,8 +20,6 @@ - - <target name="build"> - <ant dir="biz.aQute.bnd" target="build" /> -- <ant dir="biz.aQute.repository" target="build" /> -- <ant dir="biz.aQute.resolve" target="build" /> - </target> - - <target name="junit" depends="__mainiterateinit"> -@@ -34,8 +32,6 @@ - - <target name="release"> - <ant dir="biz.aQute.bnd" target="mainRelease" /> -- <ant dir="biz.aQute.repository" target="mainRelease" /> -- <ant dir="biz.aQute.resolve" target="mainRelease" /> - </target> - - <target name="clean" depends="__mainiterateinit"> ---- a/dist/bnd.bnd -+++ b/dist/bnd.bnd -@@ -2,7 +2,7 @@ - # This directory holds the distribution of the bnd project - # - ---dependson: biz.aQute.bnd, biz.aQute.resolve, biz.aQute.repository, biz.aQute.jpm, osgi.r5 -+-dependson: biz.aQute.bnd, biz.aQute.jpm, osgi.r5 - -nobundles: true - - no.junit: true diff --git a/debian/patches/display_bsn_on_missing_bundle.patch b/debian/patches/display_bsn_on_missing_bundle.patch index b15fd71..d351eac 100644 --- a/debian/patches/display_bsn_on_missing_bundle.patch +++ b/debian/patches/display_bsn_on_missing_bundle.patch @@ -12,7 +12,7 @@ Forwarded: no --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java -@@ -891,8 +891,11 @@ +@@ -950,8 +950,11 @@ File file = plugin.get(bsn, version, attrs, blocker); // and the entry must exist // if it does, return this as a result diff --git a/debian/patches/embedded-repo.patch b/debian/patches/embedded-repo.patch index b273e8e..e09436a 100644 --- a/debian/patches/embedded-repo.patch +++ b/debian/patches/embedded-repo.patch @@ -6,10 +6,10 @@ The embedded-repo.jar is not built. To avoid a FTBFS the error is commented out. --- a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java -@@ -314,7 +314,7 @@ - if (in != null) - unzip(in, root); - else { +@@ -349,7 +349,7 @@ + return true; + } + - error("Couldn't find embedded-repo.jar in bundle "); + //error("Couldn't find embedded-repo.jar in bundle "); } diff --git a/debian/patches/implement-missing-methods.patch b/debian/patches/implement-missing-methods.patch index a94d6d3..c8f23de 100644 --- a/debian/patches/implement-missing-methods.patch +++ b/debian/patches/implement-missing-methods.patch @@ -7,27 +7,9 @@ can be dropped when a future release of bnd incorporates the changes from OSGi R6. Forwarded: no ---- - biz.aQute.launcher/src/aQute/launcher/Launcher.java | 3 ++- - biz.aQute.launcher/src/aQute/launcher/minifw/Context.java | 7 +++++++ - .../src/aQute/launcher/minifw/MiniFramework.java | 11 +++++++++++ - 3 files changed, 20 insertions(+), 1 deletion(-) - ---- a/biz.aQute.launcher/src/aQute/launcher/Launcher.java -+++ b/biz.aQute.launcher/src/aQute/launcher/Launcher.java -@@ -739,7 +739,8 @@ - Class< ? > clazz = loader.loadClass(implementation); - FrameworkFactory factory = (FrameworkFactory) clazz.newInstance(); - trace("Framework factory %s", factory); -- systemBundle = factory.newFramework(p); -+ Map<String,String> configuration = (Map) p; -+ systemBundle = factory.newFramework(configuration); - trace("framework instance %s", systemBundle); - } else { - trace("using embedded mini framework because we were told not to use META-INF/services"); --- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -@@ -370,4 +370,11 @@ +@@ -368,4 +368,11 @@ // TODO Auto-generated method stub return null; } diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch index 51e6e85..a08c794 100644 --- a/debian/patches/java8-compatibility.patch +++ b/debian/patches/java8-compatibility.patch @@ -25,8 +25,8 @@ Forwarded: no --- 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.*; +@@ -42,7 +42,7 @@ + import aQute.bnd.service.classparser.*; import aQute.bnd.version.*; import aQute.bnd.version.Version; -import aQute.lib.base64.*; @@ -69,8 +69,8 @@ Forwarded: no --- 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.*; +@@ -42,7 +42,7 @@ + import aQute.bnd.service.repository.SearchableRepository.ResourceDescriptor; import aQute.bnd.version.*; import aQute.configurable.*; -import aQute.lib.base64.*; @@ -135,11 +135,31 @@ Forwarded: no +++ b/biz.aQute.launcher/bnd.bnd @@ -10,6 +10,6 @@ - Bundle-Version: 1.2.1.${tstamp} + Bundle-Version: 1.3.0.${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 + Premain-Class: aQute.launcher.agent.LauncherAgent +--- a/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java +@@ -7,7 +7,7 @@ + import javax.net.ssl.*; + + import aQute.bnd.service.url.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.libg.glob.*; + + /** +--- a/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java +@@ -9,7 +9,7 @@ + import javax.net.ssl.*; + + import aQute.bnd.build.*; +-import aQute.lib.base64.*; ++import aQute.lib.base64.Base64; + import aQute.lib.hex.*; + import aQute.lib.settings.*; + diff --git a/debian/patches/no-ee.j2se.patch b/debian/patches/no-ee.j2se.patch index bae1e4a..2c4dcd8 100644 --- a/debian/patches/no-ee.j2se.patch +++ b/debian/patches/no-ee.j2se.patch @@ -5,16 +5,6 @@ Subject: no ee.j2se We already ship a full-blown JDK in Debian. Forwarded: not-needed ---- - aQute.libg/bnd.bnd | 3 +-- - biz.aQute.bnd/bnd.bnd | 3 +-- - biz.aQute.bndlib.tests/bnd.bnd | 1 - - biz.aQute.jpm/bnd.bnd | 1 - - biz.aQute.launcher/bnd.bnd | 4 +--- - biz.aQute.repository/bnd.bnd | 1 - - biz.aQute.resolve/bnd.bnd | 3 +-- - 7 files changed, 4 insertions(+), 12 deletions(-) - --- a/aQute.libg/bnd.bnd +++ b/aQute.libg/bnd.bnd @@ -1,5 +1,4 @@ @@ -23,7 +13,7 @@ Forwarded: not-needed +-buildpath: com.springsource.junit Export-Package: aQute.lib.*, aQute.libg.*, aQute.configurable, aQute.service.* - Bundle-Version: 2.7.4.${tstamp;yyyyMMdd-HHmmss} + Bundle-Version: 2.8.0.${tstamp;yyyyMMdd-HHmmss} --- a/biz.aQute.bnd/bnd.bnd +++ b/biz.aQute.bnd/bnd.bnd @@ -4,7 +4,6 @@ @@ -37,8 +27,8 @@ Forwarded: not-needed --- a/biz.aQute.bndlib.tests/bnd.bnd +++ b/biz.aQute.bndlib.tests/bnd.bnd @@ -6,7 +6,6 @@ - osgi.cmpn;version=4.3.0,\ - osgi.core;version=4.2.1,\ + osgi.cmpn;version=4.3.1,\ + osgi.core;version=4.3.1,\ junit.osgi;version=3.8.2,\ - ee.j2se;version=${javac.ee},\ org.mockito.mockito-all;version=1.9.0 @@ -59,7 +49,7 @@ Forwarded: not-needed @@ -1,9 +1,7 @@ -buildpath: biz.aQute.bndlib;version=project,\ aQute.libg;version=project,\ - osgi.core;version=4.2.1,\ + osgi.core;version=4.3.1,\ - junit.osgi;version=3.8.2,\ - ee.j2se;version=${javac.ee} -# ee.minimum;version=1.2.1 @@ -67,6 +57,13 @@ Forwarded: not-needed Launcher-Plugin: aQute.launcher.plugin.ProjectLauncherImpl +@@ -14,4 +12,4 @@ + javac.source = 1.5 + javac.target = jsr14 + +-Premain-Class: aQute.launcher.agent.LauncherAgent +\ No newline at end of file ++Premain-Class: aQute.launcher.agent.LauncherAgent --- a/biz.aQute.repository/bnd.bnd +++ b/biz.aQute.repository/bnd.bnd @@ -18,7 +18,6 @@ @@ -79,18 +76,11 @@ Forwarded: not-needed Bnd-Plugins: --- a/biz.aQute.resolve/bnd.bnd +++ b/biz.aQute.resolve/bnd.bnd -@@ -3,7 +3,6 @@ +@@ -10,7 +10,6 @@ junit.osgi,\ biz.aQute.bndlib;version=snapshot,\ biz.aQute.repository;version=snapshot,\ - ee.j2se;version=${javac.ee},\ org.mockito.mockito-all,\ org.apache.felix.resolver,\ - osgi.cmpn -@@ -15,4 +14,4 @@ - - Private-Package: biz.aQute.resolve.* - --Conditional-Package: aQute.libg.* -\ No newline at end of file -+Conditional-Package: aQute.libg.* + osgi.cmpn;version=4.3.1 diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch index d48f28c..7d4dea9 100644 --- a/debian/patches/no-osgi.r5.patch +++ b/debian/patches/no-osgi.r5.patch @@ -14,8 +14,8 @@ Forwarded: not-needed --- a/biz.aQute.bnd/bnd.bnd +++ b/biz.aQute.bnd/bnd.bnd @@ -11,8 +11,7 @@ - osgi.cmpn;version=4.3,\ - osgi.core;version=4.1,\ + osgi.cmpn;version=4.3.1,\ + osgi.core;version=4.3.1,\ junit.osgi,\ - org.osgi.impl.bundle.bindex,\ - osgi.r5;version=1.0.1 @@ -25,24 +25,13 @@ Forwarded: not-needed # by hand even though they are in bndlib. However, they are added --- a/biz.aQute.bndlib/bnd.bnd +++ b/biz.aQute.bndlib/bnd.bnd -@@ -42,8 +42,7 @@ +@@ -44,8 +44,7 @@ -buildpath: com.springsource.junit,\ - osgi.cmpn;version=4.3,\ + osgi.cmpn;version=4.3.1,\ aQute.libg;version=project,\ -- osgi.core;version=4.1,\ +- osgi.core;version=4.3.1,\ - osgi.r5;version=1.0.1,\ -+ osgi.core;version=4.1 ++ osgi.core;version=4.3.1 - Bundle-Version: 2.2.0.${tstamp;yyyyMMdd-HHmmss} Import-Package: junit.framework;resolution:=optional,\ ---- a/dist/bnd.bnd -+++ b/dist/bnd.bnd -@@ -2,7 +2,7 @@ - # This directory holds the distribution of the bnd project - # - ---dependson: biz.aQute.bnd, biz.aQute.jpm, osgi.r5 -+-dependson: biz.aQute.bnd, biz.aQute.jpm - -nobundles: true - - no.junit: true + org.osgi.resource;resolution:=optional,\ diff --git a/debian/patches/no_ee_minimum.patch b/debian/patches/no_ee_minimum.patch index 3ce1849..b08d151 100644 --- a/debian/patches/no_ee_minimum.patch +++ b/debian/patches/no_ee_minimum.patch @@ -13,44 +13,33 @@ Forwarded: not-needed --- a/biz.aQute.bndlib/bnd.bnd +++ b/biz.aQute.bndlib/bnd.bnd -@@ -44,7 +44,6 @@ +@@ -46,7 +46,6 @@ aQute.libg;version=project,\ - osgi.core;version=4.1,\ + osgi.core;version=4.3.1,\ osgi.r5;version=1.0.1,\ - ee.j2se;version=${javac.ee} - Bundle-Version: 2.2.0.${tstamp;yyyyMMdd-HHmmss} Import-Package: junit.framework;resolution:=optional,\ + org.osgi.resource;resolution:=optional,\ --- a/biz.aQute.junit/bnd.bnd +++ b/biz.aQute.junit/bnd.bnd @@ -2,8 +2,7 @@ - osgi.cmpn;version=4.2.1,\ + osgi.cmpn;version=4.3.1,\ biz.aQute.bndlib;version=project,\ aQute.libg;version=project,\ -- osgi.core;version=4.2.1,\ +- osgi.core;version=4.3.1,\ - ee.j2se;version=${javac.ee} -+ osgi.core;version=4.2.1 ++ osgi.core;version=4.3.1 Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl --- a/demo/bnd.bnd +++ b/demo/bnd.bnd -@@ -2,9 +2,7 @@ - Bundle-Activator: com.example.demo.Activator - Bundle-SymbolicName: demo +@@ -25,7 +25,6 @@ ---buildpath: osgi.core,\ -- ee.minimum;version=1.2.1,\ -- ee.j2se;version=${javac.ee} -+-buildpath: osgi.core - - - -testpath: \ -@@ -25,7 +23,6 @@ - * - - -buildpath: osgi.core,\ + -buildpath: \ + osgi.core;version=4.3.1,\ - ee.j2se;version=1.5.0,\ - junit.osgi + biz.aQute.bnd.annotation;version=latest,\ + com.springsource.org.junit - javac.target=1.5 diff --git a/debian/patches/series b/debian/patches/series index 34511ab..d9f84bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,7 @@ no_ee_minimum.patch display_bsn_on_missing_bundle.patch no-ee.j2se.patch -findbugs.patch embedded-repo.patch -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
