TCI - Add explicit import-package for javax.inject
Change-Id: I0a6a4ace897dbd2cc5b127c4d6ef92cabdeef6e8
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
index 2592b60..f2e87b6 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
org.eclipse.jface;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
+Import-Package: javax.inject;version="1.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
index 503fa16..b076380 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@
org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.annotation;version="1.1.0",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.osgi.service.event;version="1.3.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
index 24f491d..7f0da73 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
Service-Component: OSGI-INF/categorizationElementTabbedRendererService.xml,OSGI-INF/compositeCategoryTreeRendererService.xml,OSGI-INF/compositeCategoryTabRendererService.xml,OSGI-INF/swtCategorizationElementRendererService.xml,OSGI-INF/swtCategorizationRendererService.xml,OSGI-INF/swtCategoryRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.databinding.property.value;version="0.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
index 59b7dea..dc377cc 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
index 03404f0..2b2f4e1 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.emfforms.spi.swt.core;version="[1.8.0,1.9.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
index bc1a365..b8592d2 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
@@ -31,6 +31,7 @@
Service-Component: OSGI-INF/booleanControlService.xml,OSGI-INF/dateTimeControlService.xml,OSGI-INF/enumControlService.xml,OSGI-INF/numberControlService.xml,OSGI-INF/textControlService.xml,OSGI-INF/xmlDateControlService.xml,OSGI-INF/viewRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
index 862964b..0101426 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.emfforms.swt.core;bundle-version="[1.8.0,1.9.0)",
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.inject;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
index 1f7ea96..af7ae51 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/pGroupRendererService.xml
-Import-Package: javax.inject;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.nebula.widgets.pgroup;version="0.0.0",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
index 604d86a..835a758 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.emfforms.swt.core;bundle-version="[1.8.0,1.9.0)",
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.inject;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
index 2aa9de5..55fd0b1 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
index debfc22..2a5fcf2 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
index 2199837..916c84f 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.databinding.property.value;version="0.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
index af0e68b..fe60d60 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@
org.eclipse.emfforms.swt.core;bundle-version="[1.8.0,1.9.0)",
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
index 045e8aa..f7ca943 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@
Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,OSGI-INF/tableDetailPanelRendererService.xml,OSGI-INF/tableRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
index c187406..a1ff5ed 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
+ javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.core.services.databinding;version="[1.8.0,1.9.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
index 7a3774e..bea4707 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@
org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.8.0,1.9.0)";resolution:=optional,
+ javax.inject;version="1.0.0",
org.osgi.service.component.annotations;version="1.2.0"
Service-Component: OSGI-INF/TextRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/typedElementBoundsControlService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
index c74134d..ce43915 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.emfforms.localization;bundle-version="[1.8.0,1.9.0)",
org.eclipse.emfforms.swt.core.di;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.inject;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.fieldassist;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
index b9a2fe7..6734164 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
+ javax.inject;version="1.0.0",
org.eclipse.swt.widgets;version="0.0.0"
Service-Component: OSGI-INF/emailRendererService.xml
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
index e2edcdb..97f6d7d 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/pGroupRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.emfforms.spi.common.report;version="[1.8.0,1.9.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
index 9f6a7b0..a260b41 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@
org.eclipse.emfforms.swt.core;bundle-version="[1.8.0,1.9.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: javax.inject;version="1.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.8.0"
