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 <benoit.maggi@cea.fr>
Signed-off-by: Florian Noyrit <florian.noyrit@cea.fr>

24 files changed, 118 insertions, 107 deletions

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