From 8d9e61b2b52ba51d774875bc4fca0f7403fc10f4 Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Wed, 12 Jun 2019 14:23:01 +0200 Subject: Bug 545631 - [Releng] Update the targets for 2019-06 RC2 - Add a strong dependency to guava 21 to avoid compiling against 27.1.0 in orbit - Rewire xwt dependency to the new milestone Change-Id: I54f2f76414b34acd186c2adfe6ce529b44f5c231 Signed-off-by: Quentin Le Menez --- .../core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF | 8 ++++---- .../core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF | 6 +++--- .../emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF | 4 ++-- .../infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF | 6 +++--- .../emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF | 6 +++--- .../org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF | 2 +- .../infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF | 8 ++++---- .../ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF | 2 +- 29 files changed, 54 insertions(+), 54 deletions(-) (limited to 'plugins/infra') diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index 947684bb410..a0914659456 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -38,8 +38,8 @@ Bundle-Activator: org.eclipse.papyrus.infra.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.io;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.io;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF index 8256a2425d2..4df02fe471d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF index 26b93e6de2c..f079016b828 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.gmf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF index f85786ee368..16162a78c8b 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF index f5234b3ea0b..fcbf4342bf1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF index ec02f4ab450..d4da534db54 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.internal.emf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF index 2ca4de6202f..f852ab6935c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.ui diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF index fa8dec782ac..561726a6ce7 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF @@ -26,6 +26,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF index 01299547039..14b1b7f8c3b 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.properties diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 48a910526be..39921d8f4e9 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -40,5 +40,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF index 3198845e42b..29371745026 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index bca832b3af2..17d427a1bc3 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -87,9 +87,9 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0", +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)", org.osgi.service.component.annotations;version="1.3.0";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml, OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF index a5340465750..7401c577c04 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.menu diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 50c8d1c28c7..6c713a4a0a1 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.properties diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF index 7b602f55ade..053680d6727 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF @@ -37,5 +37,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0", org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF index bbb178b2f23..6de33a66c95 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization.readonly diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF index 9cfe66105c9..38fe6e18ec3 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.infra.internationalization.Activator -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF index aa668a1584e..c9f6aaaba33 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF @@ -14,8 +14,8 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.reflect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.reflect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.sync diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF index fff1a80d826..9a4d29f9c94 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.common diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF index 3276236bba4..dbec808e7ae 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.controlmode diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index 70bf8e3d37e..b52a7306dd3 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -82,5 +82,5 @@ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF index 5d4227b6163..13ade560a0b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlug Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index b98fa9093cc..1a57467c5cb 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF index 7dea144bbdb..d731db4896c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.localizer diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF index 0cabf8d626e..0a98516f398 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.validation diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF index bbd16d7b676..ad305634352 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.types.core diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF index cbb8cbf7edb..6c82345ef7a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: com.google.common.base;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.resources diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF index e669489c1e8..f87b6b7df27 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF @@ -44,8 +44,8 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator Bundle-Description: Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies. Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true -Import-Package: com.google.common.base;version="21.0.0", - com.google.common.cache;version="21.0.0", - com.google.common.collect;version="21.0.0", - com.google.common.util.concurrent;version="21.0.0" +Import-Package: com.google.common.base;version="[21.0.0, 22.0.0)", + com.google.common.cache;version="[21.0.0, 22.0.0)", + com.google.common.collect;version="[21.0.0, 22.0.0)", + com.google.common.util.concurrent;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF index cb4a465a4ff..33a14829ee4 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF @@ -39,5 +39,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="21.0.0" +Import-Package: com.google.common.collect;version="[21.0.0, 22.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.widgets -- cgit v1.2.3