TCI - Unify e4.core dependecies
Unify and lower dependencies to e4.core to a lower bound of 1.3.0 (or
lower if this was already the case) and an upper bound of 2.0.0. This is
necessary for backwards compatibility to older eclipse distributions
(e.g. Oxygen)
Change-Id: I6dfc83742c8f002a51b64b209b4e19e409fea61f
Signed-off-by: Lucas Koehler <lkoehler@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
index b8834ae..2c70a4d 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Version: 1.22.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
javax.inject;bundle-version="[1.0.0,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
index 9908414..f3b0294 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)",
+Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.editor;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)"
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
index a3cf15c..02e32d8 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.e4.core.di.annotations;version="[1.6.0,2.0.0)",
+Import-Package: org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
index 9f59d21..8c4bea6 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.context
-Import-Package: org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)";resolution:=optional,
+Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)";resolution:=optional,
org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index 2cb4cc8..abd61e6 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.22.0,1.23.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.e4.core.di;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.22.0,1.23.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
index 3ffe8ad..566a2ba 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@
Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.e4.core.contexts;bundle-version="[1.7.0,1.9.0)",
+ org.eclipse.e4.core.contexts;bundle-version="[1.3.0,1.9.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.e4.core.di;bundle-version="[1.7.0,1.8.0)",
+ org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.di
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 de5d43a..2035c4f 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
@@ -30,7 +30,7 @@
org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.e4.core.di.annotations;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
diff --git a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
index 0dcfc36..6d28218 100644
--- a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
@@ -35,8 +35,8 @@
org.eclipse.core.databinding.observable.value;version="0.0.0",
org.eclipse.core.databinding.property.list;version="0.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.e4.core.di;version="[1.6.0,2.0.0)",
- org.eclipse.e4.core.di.suppliers;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.di;version="[1.3.0,2.0.0)",
+ org.eclipse.e4.core.di.suppliers;version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.view.spi.model;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.bazaar;version="[1.22.0,1.23.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
index a30ae3d..84c4f6e 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.e4.core.contexts;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index 9237cf8..553270c 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
- org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
index fb52512..0c6fdbc 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.bazaar.tests
Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
- org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
index 43b8fb6..ba222d9 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
@@ -56,7 +56,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.editor.ecore.test
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.22.0,1.23.0)",
org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)";resolution:=optional,
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 0f9a3b9..b41182a 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
@@ -24,8 +24,8 @@
Service-Component: OSGI-INF/testControlSWTRendererServiceDI.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.e4.core.di;version="[1.6.0,2.0.0)",
- org.eclipse.e4.core.di.annotations;version="[1.6.0,2.0.0)",
+ org.eclipse.e4.core.di;version="[1.3.0,2.0.0)",
+ org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
org.eclipse.swt;version="0.0.0",
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index e2a6dc0..b7902da 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.core.tests
-Import-Package: org.eclipse.e4.core.contexts;version="[1.6.0,2.0.0)",
+Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.spi.label.model;version="[1.22.0,1.23.0)",
org.eclipse.emf.ecp.view.spi.vertical.model;version="1.22.0",
