Bug 348123 - Annotation @PostConstruct not found by injector
We use javax.annotation;version="1.0.0" in Eclipse 4
diff --git a/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF
index 759f173..03b329a 100644
--- a/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject
+Import-Package: javax.inject;version="1.0.0"
Export-Package: org.eclipse.e4.ui.di;x-friends:="org.eclipse.e4.ui.workbench,org.eclipse.ui.workbench,org.eclipse.e4.core.contexts.debug",
org.eclipse.e4.ui.internal.di;x-internal:=true
Require-Bundle: org.eclipse.e4.core.di;bundle-version="0.9.0",
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF
index 8309aff..37313db 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0",
org.eclipse.e4.core.di;bundle-version="0.9.0",
org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
org.eclipse.e4.core.services;bundle-version="0.9.1",
@@ -21,6 +20,7 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.e4.ui.internal.workbench.swt,
org.eclipse.osgi.util;version="1.1.0"
Export-Package: org.eclipse.e4.ui.workbench.addons.cleanupaddon,
diff --git a/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF b/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF
index fe540e1..aa27df7 100644
--- a/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.e4.examples.services/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Activator: org.eclipse.e4.examples.services.snippets.SnippetActivator
-Import-Package: javax.inject,
+Import-Package: javax.inject;version="1.0.0",
org.osgi.framework;version="1.5.0"
Require-Bundle: org.eclipse.equinox.app,
org.eclipse.equinox.common;bundle-version="3.4.0",
diff --git a/features/org.eclipse.e4.rcp/feature.xml b/features/org.eclipse.e4.rcp/feature.xml
index d4137af..4f7f248 100644
--- a/features/org.eclipse.e4.rcp/feature.xml
+++ b/features/org.eclipse.e4.rcp/feature.xml
@@ -7,7 +7,7 @@
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
-
+
<description>
%description
</description>
@@ -151,7 +151,7 @@
id="javax.annotation"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.qualifier"
unpack="false"/>
<plugin
@@ -224,20 +224,20 @@
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.apache.commons.jxpath"
download-size="0"
install-size="0"
version="1.3.0.qualifier"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.e4.emf.xpath"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
os="macosx"
diff --git a/tests/org.eclipse.e4.ui.keybinding.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.keybinding.tests/META-INF/MANIFEST.MF
index 66491a3..2cafe4d 100644
--- a/tests/org.eclipse.e4.ui.keybinding.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.ui.keybinding.tests/META-INF/MANIFEST.MF
@@ -19,11 +19,11 @@
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.9.1",
org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.1",
org.junit,
- javax.annotation;bundle-version="1.0.0",
- javax.inject;bundle-version="1.0.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.ui.tests.harness;bundle-version="1.1.0",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0"
diff --git a/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF
index 7473d03..4d2f1cc 100644
--- a/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.9.1",
org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.1",
- org.junit,
- javax.annotation;bundle-version="1.0.0",
- javax.inject;bundle-version="1.0.0"
+ org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0"
