Bug 569770 - Req-Bundle instead of Import-Pack for javax.annotation javax.annotation package is also incompletely provided by some other bundles. OSGi may wire o.e.e4.core.di to those incomplete bundle/package and then fail at finding some of the classes like PostConstruct/PreDestroy. We prefer adding an explicit Require-Bundle requirement, which gives stronger guarantees about the package content. Change-Id: Iab2bce4c678dbfb10043cb3dce4efee0a5d28c54 Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF index 30dad85..c76a145 100644 --- a/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@ org.eclipse.e4.core.internal.di;x-friends:="org.eclipse.e4.core.contexts", org.eclipse.e4.core.internal.di.osgi;x-internal:=true, org.eclipse.e4.core.internal.di.shared;x-friends:="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di.extensions.supplier" -Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport -Import-Package: javax.annotation;version="1.3.5", - javax.inject;version="1.0.0", +Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, + javax.annotation;bundle-version="[1.3.5,2.0.0)" +Import-Package: javax.inject;version="1.0.0", org.eclipse.osgi.framework.log;version="1.1.0", org.osgi.framework;version="1.8.0", org.osgi.util.tracker;version="1.5.1"