Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Webster2011-06-03 15:26:08 +0000
committerPaul Webster2011-06-03 15:26:08 +0000
commit61a626d011c0fedac791c3426d98e99c125fbcb3 (patch)
treebcc33a3a2abb6076937b381730aa1721d77093ac
parent6db7ed9f13f31c238997c3c6ee8c072e8c95f79a (diff)
downloadorg.eclipse.e4.tools-61a626d011c0fedac791c3426d98e99c125fbcb3.tar.gz
org.eclipse.e4.tools-61a626d011c0fedac791c3426d98e99c125fbcb3.tar.xz
org.eclipse.e4.tools-61a626d011c0fedac791c3426d98e99c125fbcb3.zip
Bug 348123 - Annotation @PostConstruct not found by injectorv20110603-1130
We use javax.annotation;version="1.0.0" in Eclipse 4
-rw-r--r--bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui.script.js/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF4
6 files changed, 11 insertions, 11 deletions
diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
index 8e138e69..a030a286 100644
--- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.e4.tools.services;bundle-version="1.0.0",
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0",
org.eclipse.core.databinding;bundle-version="1.4.0"
Service-Component: OSGI-INF/selectionproviderfunction.xml
Export-Package: org.eclipse.e4.tools.compat.parts
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
+Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF
index 2524bcfe..ec5a09b5 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
org.eclipse.swt;bundle-version="3.6.0",
- javax.inject;bundle-version="1.0.0",
org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
org.eclipse.e4.core.services;bundle-version="0.9.1",
org.eclipse.e4.ui.services;bundle-version="0.9.1",
@@ -19,7 +18,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.e4.core.contexts,
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.e4.core.contexts,
org.eclipse.e4.core.di.annotations
Service-Component: OSGI-INF/xmiresourcecontextfunction.xml, OSGI-INF/selectionproviderfunction.xml
Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF
index d4fa5995..958a5ec0 100644
--- a/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.e4.tools.emf.liveeditor;singleton:=true
Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: javax.inject;bundle-version="1.0.0",
- org.eclipse.e4.ui.services;bundle-version="0.9.1",
+Require-Bundle: org.eclipse.e4.ui.services;bundle-version="0.9.1",
org.eclipse.swt;bundle-version="3.6.0",
org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
org.eclipse.emf.edit;bundle-version="2.6.0",
@@ -22,3 +21,4 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
Bundle-Vendor: %Bundle-Vendor
Service-Component: OSGI-INF/extensionlookup.xml
Bundle-ActivationPolicy: lazy
+Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui.script.js/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui.script.js/META-INF/MANIFEST.MF
index 19bf479b..1d04fb38 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui.script.js/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui.script.js/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0",
org.eclipse.e4.core.di;bundle-version="0.9.0",
org.eclipse.osgi;bundle-version="3.7.0",
org.eclipse.jface.text;bundle-version="3.7.0",
- org.eclipse.e4.tools.services;bundle-version="1.0.0",
- javax.inject;bundle-version="1.0.0"
+ org.eclipse.e4.tools.services;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/resourceprovider.xml
+Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 8d3f7496..4765b76f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -26,14 +26,14 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.0",
org.eclipse.equinox.registry;bundle-version="3.5.0",
org.eclipse.e4.core.contexts;bundle-version="0.9.0",
org.eclipse.e4.ui.di;bundle-version="0.9.0",
- javax.annotation;bundle-version="1.0.0",
org.eclipse.e4.tools.services;bundle-version="1.0.0",
org.eclipse.e4.core.di.extensions;bundle-version="0.9.0",
org.eclipse.jface.text;bundle-version="3.7.0",
org.eclipse.e4.ui.widgets;bundle-version="1.0.0",
org.eclipse.equinox.preferences;bundle-version="3.4.0"
Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.core.runtime.jobs,
org.osgi.framework;version="1.5.0"
Export-Package: org.eclipse.e4.tools.emf.ui.common,
diff --git a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
index 25140262..19144471 100644
--- a/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@ Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
org.eclipse.equinox.common;bundle-version="3.6.0",
org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- javax.annotation;bundle-version="1.0.0",
org.eclipse.e4.core.di;bundle-version="0.9.0",
- javax.inject;bundle-version="1.0.0",
org.eclipse.osgi;bundle-version="3.7.0",
org.eclipse.e4.core.services;bundle-version="0.9.1"
Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml, OSGI-INF/messagefactoryservice.xml, OSGI-INF/translationsupplier.xml
Bundle-ActivationPolicy: lazy
+Import-Package: javax.annotation;version="1.0.0",
+ javax.inject;version="1.0.0"

Back to the top