From 5e003e0b53e1ad9e4cfb10acc96a407324026816 Mon Sep 17 00:00:00 2001 From: Benoit Maggi Date: Thu, 30 Mar 2017 13:34:38 +0200 Subject: Bug 514332 - Papyrus should never reexport non-singleton plugins - remove Required-Bundle Guava (and their re-export) - use package import for Guava dependencies Change-Id: Ie1e383b6b8ed1d57747345c2788c0c63de1f08bb Signed-off-by: Benoit Maggi Signed-off-by: Florian Noyrit --- .../META-INF/MANIFEST.MF | 50 ++++++------ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 23 +++--- .../manifest_project/META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 45 +++++------ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 54 ++++++------- .../META-INF/MANIFEST.MF | 76 +++++++++--------- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 59 +++++++------- .../org.eclipse.papyrus.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 60 +++++++-------- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 27 ------- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 90 +++++++++++----------- .../META-INF/MANIFEST.MF | 78 +++++++++---------- .../META-INF/MANIFEST.MF | 78 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 56 +++++++------- .../META-INF/MANIFEST.MF | 2 +- 77 files changed, 419 insertions(+), 422 deletions(-) delete mode 100644 tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF (limited to 'tests/junit/plugins') diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF index a32432a4115..ee8a8dec1b2 100644 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF @@ -1,25 +1,25 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", - org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", - org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)", - org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)", - org.junit;bundle-version="[4.12.0,5.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", - org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)", - org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)" -Export-Package: org.eclipse.papyrus.bundles.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator -Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde;bundle-version="[3.12.0,4.0.0)", + org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.update.configurator;bundle-version="[3.3.0,4.0.0)", + org.junit;bundle-version="[4.12.0,5.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", + org.eclipse.pde.api.tools;bundle-version="[1.0.1,2.0.0)", + org.eclipse.jdt.core;bundle-version="[3.11.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)" +Export-Package: org.eclipse.papyrus.bundles.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF index cfaa0cdd400..648c5d8a1ec 100755 --- a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui, diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF index d194ed496fe..cf15aceb3ac 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF @@ -1,11 +1,12 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)" -Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests -Bundle-Vendor: Eclipse Modeling Project -Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier -Bundle-Name: Papyrus Project Editor Tests -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.eclipse.project.editors.tests +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.0.qualifier +Bundle-Name: Papyrus Project Editor Tests +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.base;version="21.0.0" diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF index f827b91b90e..3ee70470ab6 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF @@ -2,7 +2,6 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui;bundle-version="3.6.0";resolution:=optional, - com.google.guava;bundle-version="21.0.0", org.eclipse.core.resources;visibility:=reexport Import-Package: com.ibm.icu.text;resolution:=optional, org.eclipse.emf.ecore;version="2.10.0" diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF index 28036c59815..68a2d13a6e3 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF @@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.navigator;bundle-version="3.5.0", org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)", @@ -43,5 +42,7 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: Papyrus Editor Integration Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.editor.integration.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.editor.integration.tests +Bundle-SymbolicName: org.eclipse.papyrus.editor.integration.tests;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" diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF index 26897e7d8f4..9ca06f1bee7 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF index 8917b8444a2..2b50ad6a26e 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF @@ -13,3 +13,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;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" diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF index 4d9bb7e1a5b..cf519473e03 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.uml2.uml;bundle-version="5.0.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", @@ -17,3 +16,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;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" diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF index 6d5e5d4f415..bd4389765aa 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF @@ -19,3 +19,6 @@ Bundle-Localization: fragment Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;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" diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF index 2736e79b7a4..9b9c37a6df7 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.uml2.uml;bundle-version="5.0.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", @@ -18,3 +17,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;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" diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF index 01af5c4aa26..349234b3d6f 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.gef;bundle-version="3.10.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", @@ -31,3 +30,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Import-Package: com.google.common.base;version="21.0.0", + com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF index aac27b03fd1..a0b0479a743 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[2.1.0,3.0.0)", @@ -29,5 +28,8 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator -Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;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" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF index ecec230ef44..1b0f9005be5 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Require-Bundle: org.junit;bundle-version="4.10.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", @@ -15,3 +14,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;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" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF index 8313aec372f..0c814d0102d 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF @@ -1,22 +1,23 @@ -Manifest-Version: 1.0 -Require-Bundle: org.junit;bundle-version="4.10.0", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)" -Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests, - org.eclipse.papyrus.infra.gmfdiag.common.utils -Bundle-Vendor: %providerName -Bundle-Version: 3.0.0.qualifier -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="5.1.0", + org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests, + org.eclipse.papyrus.infra.gmfdiag.common.utils +Bundle-Vendor: %providerName +Bundle-Version: 3.0.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.util.concurrent;version="21.0.0" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF index fbec2f1e699..1e0271ee167 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: GMF Diagram Menu Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF index 7ffbb776e70..25f03b62657 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common.tests;singleton:=true Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.tests.Activator Bundle-Vendor: %Bundle-Vendor diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF index daea8a0076c..1c77121bc07 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.tests.Activator Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF index b78ceb7791b..00df4de8075 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: This plugin provides JUnit test for the Papyrus NatTable metamodel -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF index a7bed50a371..d24b0b2ebb3 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.nattable.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF index 4a9e6f4e635..e022fb70db0 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF @@ -1,27 +1,27 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.junit, - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.emf.ecore, - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)" -Export-Package: org.eclipse.papyrus.infra.nattable.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %Bundle-Name -Bundle-Activator: org.eclipse.papyrus.infra.nattable.tests.Activator -Bundle-ManifestVersion: 2 -Bundle-Description: T%Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.junit, + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.ecore, + org.eclipse.uml2.uml, + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)" +Export-Package: org.eclipse.papyrus.infra.nattable.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.infra.nattable.tests.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: T%Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF index b80bfee9547..1307d1b8bc9 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF @@ -1,38 +1,38 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.junit, - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.gmf.runtime.notation.edit, - org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0", - org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.ui.navigator;bundle-version="3.5.500", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" -Export-Package: org.eclipse.papyrus.infra.nattable.views.tests, - org.eclipse.papyrus.infra.nattable.views.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %Bundle-Name -Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.tests.Activator -Bundle-ManifestVersion: 2 -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.uml2.uml, + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.junit, + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.transaction;bundle-version="1.8.0", + org.eclipse.gmf.runtime.notation.edit, + org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui.navigator;bundle-version="3.5.500", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.infra.nattable.views.tests, + org.eclipse.papyrus.infra.nattable.views.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.tests.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF index 5904e6b069a..cf2278d27dd 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.infra.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF index a8467c51aae..6f0cf973fc4 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.core.databinding;bundle-version="1.4.0", org.eclipse.core.databinding.beans;bundle-version="1.2.0", org.eclipse.core.databinding.property;bundle-version="1.4.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.tools.databinding, org.eclipse.papyrus.infra.tools.tests @@ -17,3 +16,4 @@ Bundle-Name: Papyrus Infrastructure Tools Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF index ab14a2a254c..0736807c947 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.ui;bundle-version="3.100.0", org.eclipse.core.runtime;bundle-version="3.10.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF index 65124e2d27e..670418648e4 100644 --- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="5.2.0" diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF index f90fd18b721..625c9878da1 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.106.0", org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.navigator;bundle-version="3.5.500", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)" @@ -28,3 +27,4 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF index 72fabfbb2b9..25387ed8a93 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF index e51d5f3d415..5b7ab69c9c4 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF index d08c4baa31c..02578513293 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic.tests +Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF index 5e600dd1a38..c07de05f6ae 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF @@ -11,5 +11,8 @@ Bundle-Vendor: Eclipse Modeling Project Bundle-Version: 1.2.0.qualifier Bundle-Name: Conditional Junit Annotations Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.junit.framework +Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +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" diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF index b25d1c85f4a..6e0643ab877 100644 --- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF @@ -1,27 +1,32 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)", - org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,3.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)" -Export-Package: org.eclipse.papyrus.junit.matchers, - org.eclipse.papyrus.junit.utils, - org.eclipse.papyrus.junit.utils.resources, - org.eclipse.papyrus.junit.utils.rules, - org.eclipse.papyrus.junit.utils.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.100.qualifier -Bundle-Name: %Bundle-Name -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator -Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.junit.utils -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)", + org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,3.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)" +Export-Package: org.eclipse.papyrus.junit.matchers, + org.eclipse.papyrus.junit.utils, + org.eclipse.papyrus.junit.utils.resources, + org.eclipse.papyrus.junit.utils.rules, + org.eclipse.papyrus.junit.utils.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 2.0.100.qualifier +Bundle-Name: %Bundle-Name +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +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.io;version="21.0.0", + com.google.common.primitives;version="21.0.0" diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF index 4332b2a3a20..6fbbebee5f9 100644 --- a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.tests +Bundle-SymbolicName: org.eclipse.papyrus.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui, diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF index 0261d0ae976..a5cac775922 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0. org.junit;bundle-version="4.10.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", @@ -17,3 +16,4 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF index 580f75db739..f618ab66311 100755 --- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF @@ -1,30 +1,30 @@ -Manifest-Version: 1.0 -Require-Bundle: org.junit;bundle-version="4.11.0", - org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" -Export-Package: org.eclipse.papyrus.sysml.nattable.allocation.tests, - org.eclipse.papyrus.sysml.nattable.allocation.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.tests.Activator -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.11.0", + org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.uml2.uml, + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.sysml;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.emf.transaction;bundle-version="1.8.0", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.sysml.nattable.allocation.tests, + org.eclipse.papyrus.sysml.nattable.allocation.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.sysml.nattable.allocation.tests.Activator +Bundle-Description: %Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.allocation.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF index f06cd8aca92..a8bdd01197a 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF @@ -35,5 +35,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.sysml.modelexplorer.tests +Bundle-SymbolicName: org.eclipse.papyrus.sysml.modelexplorer.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF index f987eff1c4c..56663553106 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ALF Backend Tests -Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.backend.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.backend.tests;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.alf.backend.tests.Activator Require-Bundle: org.eclipse.core.runtime, diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF index 7962f9ad9e2..172800a7fd1 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0", org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0", org.eclipse.xtend.lib, - com.google.guava;bundle-version="21.0.0", org.eclipse.xtext.xbase.lib, org.eclipse.xtend;bundle-version="1.4.0", org.eclipse.emf.ecore.xmi;visibility:=reexport, diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF index ef1ad088853..49f0f42e54b 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)", com.google.inject;bundle-version="3.0.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.8.0", org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF deleted file mode 100644 index b1658c00995..00000000000 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime, - org.junit;bundle-version="4.11.0", - org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", - org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", - org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0", - org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", - org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0", - com.google.inject;bundle-version="3.0.0", - com.google.guava;bundle-version="21.0.0", - org.eclipse.xtext.xbase.lib;bundle-version="2.8.0" -Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: . -Bundle-Version: 1.2.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %pluginName -Bundle-ManifestVersion: 2 -Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF index 2b3a370b764..479833fcde7 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[2.0.0,3.0.0)", com.google.inject;bundle-version="3.0.0", - com.google.guava;bundle-version="21.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.8.0", org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)" Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF index 0969c6f4edb..f4efffbaa34 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.core.expressions;bundle-version="3.4.600", org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.decoratormodel.controlmode;bundle-version="[1.2.0,2.0.0)" @@ -29,3 +28,4 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF index 3984cbc05e8..8dd560aeba2 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.core.expressions;bundle-version="3.4.600", org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests, @@ -31,3 +30,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;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" diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF index bd1ef6d4d5b..dcd50cebb5c 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF @@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions, org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.xtend.lib;bundle-version="2.8.3", - com.google.guava;bundle-version="21.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.8.3", org.eclipse.papyrus.tests.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", @@ -40,5 +39,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.test.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF index c2dc5499400..963699ecde2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF @@ -38,5 +38,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: This plugin provides tests for the papyrus plugin UML Diagram Common -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF index 4798f698084..374ee5a09d0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.test.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF index 091509a29ca..5bfad2e47f0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.test.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF index 12c66dac633..8a6f2ecaf05 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: DND Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF index fec72a014bf..25e5726a791 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: IODiagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF index b69d989606f..ef74112ca4e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: Profile Diagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF index d25a4750075..6fd60977e18 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF index 44bfda018a7..f3fafd3a06c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF index 55c5e7eb773..4a85a9a7f6d 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF index 174f0ddc02d..dacf909e351 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF @@ -27,7 +27,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.xtext.xbase.lib, - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)", org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="[2.1.0,3.0.0)", diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF index 5d8497f820c..6b84cbbadc1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: Papyrus Timing Diagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF index 5df426737dc..b0f2370f5eb 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0", org.eclipse.ui.ide;bundle-version="3.8.1", org.eclipse.jface;bundle-version="3.8.101", org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.resources, @@ -20,5 +19,7 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;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" diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF index 5088e04d7d5..0e66c0efd94 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF @@ -24,3 +24,4 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)", org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF index 13decf01fc8..b4ccdfe4a3d 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.tests.Activator Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF index bb415593dde..f7e9f5f5667 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF @@ -1,45 +1,45 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.nattable.clazz.config;bundle-version="[3.0.0,4.0.0)", - org.eclipse.uml2.uml;bundle-version="5.0.1", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.junit;bundle-version="4.11.0", - org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", - ca.odell.glazedlists;bundle-version="1.9.0", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", - org.eclipse.ui.navigator, - org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", - org.eclipse.ui.ide, - org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)", - org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)", - org.eclipse.swt, - org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)" -Export-Package: org.eclipse.papyrus.uml.nattable.clazz.config.tests, - org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %Bundle-Name -Bundle-Activator: org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator -Bundle-ManifestVersion: 2 -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.clazz.config.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.nattable.clazz.config;bundle-version="[3.0.0,4.0.0)", + org.eclipse.uml2.uml;bundle-version="5.0.1", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.junit;bundle-version="4.11.0", + org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.transaction;bundle-version="1.8.0", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + ca.odell.glazedlists;bundle-version="1.9.0", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.ui.navigator, + org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", + org.eclipse.ui.ide, + org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)", + org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)", + org.eclipse.swt, + org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.nattable.clazz.config.tests, + org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %Bundle-Name +Bundle-Activator: org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator +Bundle-ManifestVersion: 2 +Bundle-Description: %Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.clazz.config.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF index b92025df44f..1eab6e5ffb7 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF @@ -1,39 +1,39 @@ -Manifest-Version: 1.0 -Require-Bundle: org.junit;bundle-version="4.11.0", - org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.ecore, - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.uml2.uml, - org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gmf.runtime.diagram.ui, - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.common, - org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)" -Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.tests.Activator -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.11.0", + org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore, + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.uml2.uml, + org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", + org.eclipse.gmf.runtime.diagram.ui, + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.common, + org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.tests.Activator +Bundle-Description: %Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF index b4ac54b9f91..c13e5a01e95 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF @@ -1,39 +1,39 @@ -Manifest-Version: 1.0 -Require-Bundle: org.junit;bundle-version="4.11.0", - org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", - org.eclipse.uml2.uml, - org.eclipse.gmf.runtime.notation, - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gef, - org.eclipse.emf.transaction, - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", - org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", - org.eclipse.core.expressions, - org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" -Export-Package: org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-Localization: plugin -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotype.display.tests.Activator -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotype.display.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0 +Require-Bundle: org.junit;bundle-version="4.11.0", + org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", + org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)", + org.eclipse.uml2.uml, + org.eclipse.gmf.runtime.notation, + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.gef, + org.eclipse.emf.transaction, + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", + org.eclipse.core.expressions, + org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)" +Export-Package: org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotype.display.tests.Activator +Bundle-Description: %Bundle-Description +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotype.display.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF index 4081258b261..a46f2fe41a9 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF index 4d9f0169ccb..08694dd3218 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.tests.Activator Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF index f25303b87c7..78961abb0e8 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF @@ -15,3 +15,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;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" diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF index d5bb879e5eb..fa2b4c39ed6 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF index d59023e91d9..0dd64af1aeb 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF index 3f0287118e4..08c0faa6686 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.papyrus.uml.profile.drafter;bundle-version="[1.3.0,2 org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="4.0.0", org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.core.databinding, org.eclipse.core.databinding.beans, org.eclipse.core.databinding.observable, @@ -27,3 +26,4 @@ Export-Package: org.eclipse.papyrus.uml.profile.drafter.tests, Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy +Import-Package: com.google.common.collect;version="21.0.0" diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF index 12c791b87a4..4b406c2438b 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: UML Textedit Parameter Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF index 53763c4e9af..ccce65b13dc 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: XText Port Editor Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF index 67fe5ffc995..3a3fbfcb273 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: XText Property editor Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF index f2199a1c916..35b2a32aafc 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF index 1ccef9f39f4..ae548648670 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: Textedit Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF index 70a0a1ddcfd..d1893df4008 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF index ad1c4b1dfca..7e1295c03ba 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)", org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", - com.google.guava;bundle-version="21.0.0", org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.jface.text;bundle-version="3.10.0", org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)" @@ -28,3 +27,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.tests;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" diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF index cf22aa42487..332dd38624a 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Version: 1.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils.tests +Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF index a5adc8b3a69..1f0f1ce9f4e 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF @@ -35,5 +35,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.tests.Activator Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests +Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests;singleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF index bb88e26ca59..dfa3049a17d 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF @@ -1,28 +1,28 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.properties.generation;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.ecore;bundle-version="2.8.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", - org.eclipse.papyrus.views.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", - org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", - org.eclipse.m2m.qvt.oml;bundle-version="3.2.0", - org.eclipse.core.resources;bundle-version="3.8.0", - org.eclipse.uml2.uml;bundle-version="4.0.0", - org.junit;bundle-version="4.10.0", - org.eclipse.core.databinding;bundle-version="1.4.1", - org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", - org.eclipse.papyrus.junit.utils;bundle-version="1.2.0" -Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.tests, - org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt -Bundle-Vendor: Eclipse Modeling Project -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: Properties view customization Tests -Bundle-ManifestVersion: 2 -Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.views.properties.model.xwt;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.properties.generation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="2.8.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.views.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", + org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.m2m.qvt.oml;bundle-version="3.2.0", + org.eclipse.core.resources;bundle-version="3.8.0", + org.eclipse.uml2.uml;bundle-version="4.0.0", + org.junit;bundle-version="4.10.0", + org.eclipse.core.databinding;bundle-version="1.4.1", + org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0" +Export-Package: org.eclipse.papyrus.views.properties.toolsmiths.tests, + org.eclipse.papyrus.views.properties.toolsmiths.tests.qvt +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: Properties view customization Tests +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF index 617ef20ab7b..a53679e2a3a 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.suite.tests.Activator -Bundle-SymbolicName: org.eclipse.papyrus.views.suite.tests +Bundle-SymbolicName: org.eclipse.papyrus.views.suite.tests;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui, -- cgit v1.2.3