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>

76 files changed, 410 insertions, 646 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
deleted file mode 100644
index 275c771f8aa..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
- *  Christian W. Damus - bug 482927
- *****************************************************************************/
-package org.eclipse.papyrus.customization.properties.ui;
-
-import java.util.Collection;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.customization.properties.Activator;
-import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.storage.actions.ContextStorageActionRegistry;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextCopyAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextDeleteAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextEditAction;
-import org.eclipse.papyrus.customization.properties.storage.actions.IContextStorageActionProvider;
-import org.eclipse.papyrus.infra.properties.contexts.Context;
-import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A Dialog to display the operations available to customize
- * the property view, such as "Copy", "Edit" or "Delete" an
- * existing representationKind.
- *
- * @author Camille Letavernier
- */
-public class CustomizationDialog extends TrayDialog implements SelectionListener {
-
-	private final ContextStorageActionRegistry actionRegistry;
-
-	private List availableContexts;
-
-	private ListViewer availableContextsViewer;
-
-	private java.util.List<Button> copyContextButtons;
-
-	private Button editContext;
-
-	private Button removeContext;
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param shell
-	 *            The shell in which the dialog will be opened
-	 */
-	public CustomizationDialog(final Shell shell) {
-		super(shell);
-
-		this.actionRegistry = new ContextStorageActionRegistry();
-	}
-
-	@Override
-	public void create() {
-		super.create();
-		super.getShell().setText(Messages.CustomizationDialog_customization);
-		super.getShell().setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$
-
-		Composite contents = new Composite(getDialogArea(), SWT.NONE);
-		contents.setLayout(new GridLayout(2, false));
-		contents.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		Label label = new Label(contents, SWT.NONE);
-		label.setText(Messages.CustomizationDialog_selectContextToEdit);
-		label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-
-		Collection<Context> contexts = PropertiesRuntime.getConfigurationManager().getCustomizableContexts();
-
-		availableContexts = new List(contents, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		availableContexts.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		availableContextsViewer = new ListViewer(availableContexts);
-		availableContextsViewer.setContentProvider(CollectionContentProvider.instance);
-		availableContextsViewer.setLabelProvider(new LabelProvider() {
-
-			@Override
-			public String getText(final Object element) {
-				if (element != null && element instanceof Context) {
-					Context context = (Context) element;
-					return context.getUserLabel() + (PropertiesRuntime.getConfigurationManager().isPlugin(context) ? Messages.CustomizationDialog_plugin : ""); //$NON-NLS-1$
-				}
-				return super.getText(element);
-			}
-		});
-		availableContextsViewer.setInput(contexts);
-		availableContexts.addSelectionListener(this);
-
-		Composite controls = new Composite(contents, SWT.NONE);
-		controls.setLayout(new FillLayout(SWT.VERTICAL));
-
-		Collection<IContextStorageActionProvider> providers = actionRegistry.getStorageActionProviders();
-		copyContextButtons = new java.util.ArrayList<Button>(providers.size());
-		for (IContextStorageActionProvider next : providers) {
-			IContextCopyAction copyAction = next.getContextCopyAction();
-			if (copyAction != null) {
-				Button copyContext = new Button(controls, SWT.PUSH);
-				copyContext.setText(copyAction.getLabel());
-				copyContext.setToolTipText(copyAction.getToolTip());
-				copyContext.setData(copyAction);
-				copyContext.setEnabled(false);
-				copyContext.addSelectionListener(this);
-
-				copyContextButtons.add(copyContext);
-			}
-		}
-		if (copyContextButtons.size() == 1) {
-			// special case: use a simpler label than "Copy to Workspace..."
-			copyContextButtons.get(0).setText(Messages.CustomizationDialog_copy);
-		}
-
-		editContext = new Button(controls, SWT.PUSH);
-		editContext.setText(Messages.CustomizationDialog_edit);
-		editContext.setToolTipText(Messages.CustomizationDialog_editSelectedContext);
-		editContext.setEnabled(false);
-		editContext.addSelectionListener(this);
-
-		removeContext = new Button(controls, SWT.PUSH);
-		removeContext.setText(Messages.CustomizationDialog_delete);
-		removeContext.setToolTipText(Messages.CustomizationDialog_removeSelectedContext);
-		removeContext.setEnabled(false);
-		removeContext.addSelectionListener(this);
-
-		availableContextsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				boolean activate = false;
-
-				IContextStorageActionProvider provider = null;
-				if (!selection.isEmpty()) {
-					Context context = (Context) selection.getFirstElement();
-					activate = !PropertiesRuntime.getConfigurationManager().isPlugin(context);
-					provider = actionRegistry.getStorageActionProvider(context);
-				}
-
-				editContext.setEnabled(activate);
-				IContextEditAction editAction = provider.getContextEditAction();
-				editContext.setToolTipText((editAction == null) ? null : editAction.getToolTip());
-				for (Button next : copyContextButtons) {
-					next.setEnabled(!selection.isEmpty());
-				}
-				removeContext.setEnabled(activate);
-				IContextDeleteAction deleteAction = provider.getContextDeleteAction();
-				removeContext.setToolTipText((deleteAction == null) ? null : deleteAction.getToolTip());
-			}
-
-		});
-
-		// generateContext = new Button(controls, SWT.PUSH);
-		// generateContext.setText("Generate");
-		// generateContext.setToolTipText("Generates a new Context from a Metamodel");
-		// generateContext.setEnabled(false);
-
-		getShell().pack();
-	}
-
-	protected void editAction() {
-		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
-		if (selection.isEmpty()) {
-			return;
-		}
-
-		Object element = selection.getFirstElement();
-		if (element instanceof Context) {
-			Context sourceContext = (Context) element;
-
-			IContextEditAction editAction = actionRegistry.getContextEditAction(sourceContext);
-			if (editAction == null) {
-				MessageDialog.openError(getShell(), Messages.CustomizationDialog_0, Messages.CustomizationDialog_1);
-				return;
-			}
-
-			try {
-				EditContextAction action = new EditContextAction(editAction);
-				action.openEditor(sourceContext);
-				close();
-			} catch (Exception ex) {
-				Activator.log.error("An error occured while initializing the customization editor", ex); //$NON-NLS-1$
-				return;
-			}
-		}
-	}
-
-	protected void copyAction(IContextCopyAction copyAction) {
-		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
-		if (selection.isEmpty()) {
-			return;
-		}
-
-		Object element = selection.getFirstElement();
-		if (element instanceof Context) {
-			Context sourceContext = (Context) element;
-			CopyContextAction action = new CopyContextAction(copyAction);
-
-			try {
-				InputDialog dialog = new InputDialog(getShell(), Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_copyOf + sourceContext.getName(), new IInputValidator() {
-
-					@Override
-					public String isValid(final String newText) {
-						if (newText.trim().equals("")) { //$NON-NLS-1$
-							return Messages.CustomizationDialog_configurationNameNotEmpty;
-						}
-						if (PropertiesRuntime.getConfigurationManager().getContext(newText) != null) {
-							return Messages.CustomizationDialog_configurationWithSameNameExists;
-						}
-						return null;
-					}
-
-				});
-				dialog.setTitle(Messages.CustomizationDialog_configurationName);
-				int result = dialog.open();
-				if (result == Window.OK) {
-					String targetName = dialog.getText();
-					Context newContext = action.copy(sourceContext, targetName, false);
-					if (newContext != null) {
-						availableContextsViewer.setInput(PropertiesRuntime.getConfigurationManager().getContexts());
-						availableContextsViewer.setSelection(new StructuredSelection(newContext), true);
-					}
-				}
-			} catch (Exception ex) {
-				Activator.log.error(ex);
-			}
-		}
-	}
-
-	protected void deleteAction() {
-		IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
-		if (selection.isEmpty()) {
-			return;
-		}
-
-		Object element = selection.getFirstElement();
-		if (element instanceof Context) {
-			Context sourceContext = (Context) element;
-			if (PropertiesRuntime.getConfigurationManager().isPlugin(sourceContext)) {
-				Activator.log.warn(Messages.CustomizationDialog_cannotDeletePluginContext);
-				// Plugin context cannot be deleted
-				return;
-			}
-
-			IContextDeleteAction deleteAction = actionRegistry.getContextDeleteAction(sourceContext);
-			if (deleteAction == null) {
-				MessageDialog.openError(getShell(), Messages.CustomizationDialog_deleteContext, Messages.CustomizationDialog_2);
-				return;
-			}
-
-			MessageDialog dialog = new MessageDialog(getShell(), Messages.CustomizationDialog_deleteContext, null, Messages.CustomizationDialog_deleteContextConfirmation1 + sourceContext.getUserLabel() + Messages.CustomizationDialog_deleteContextConfirmation2,
-					MessageDialog.CONFIRM, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 2);
-			int result = dialog.open();
-			if (result == 0) { // 0 is "Yes" (It is *not* the same 0 as Window.OK)
-				RemoveContextAction action = new RemoveContextAction(deleteAction);
-				action.removeContext(sourceContext);
-				availableContextsViewer.setInput(PropertiesRuntime.getConfigurationManager().getContexts());
-			}
-		}
-	}
-
-	@Override
-	protected int getShellStyle() {
-		return super.getShellStyle() | SWT.RESIZE;
-	}
-
-	@Override
-	protected Composite getDialogArea() {
-		return (Composite) super.getDialogArea();
-	}
-
-
-	@Override
-	public void widgetSelected(final SelectionEvent e) {
-		if (e.widget == editContext) {
-			editAction();
-		} else if (e.widget == removeContext) {
-			deleteAction();
-		} else if (e.widget.getData() instanceof IContextCopyAction) {
-			copyAction((IContextCopyAction) e.widget.getData());
-		}
-	}
-
-	@Override
-	public void widgetDefaultSelected(final SelectionEvent e) {
-		if (e.widget == availableContexts) {
-			IStructuredSelection selection = (IStructuredSelection) availableContextsViewer.getSelection();
-			if (!selection.isEmpty()) {
-				Context context = (Context) selection.getFirstElement();
-				if (PropertiesRuntime.getConfigurationManager().isPlugin(context)) {
-					if (copyContextButtons.size() == 1) {
-						copyAction((IContextCopyAction) copyContextButtons.get(0).getData());
-					}
-				} else {
-					editAction();
-				}
-			}
-		}
-	}
-
-	@Override
-	public boolean isResizable() {
-		return true;
-	}
-}
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
index 46e3c4a8b6a..d83340f9f56 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="21.0.0",
  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.papyrus.dev.tests.framework;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
@@ -14,3 +13,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.ui.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
index d8939b1eab5..bebc055144a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="21.0.0",
  org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)"
@@ -13,3 +12,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.dev.tests.framework.internal.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.dev.tests.framework;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/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index 484f599f05b..45fb0041158 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
@@ -1,20 +1,19 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.mwe.core;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
- org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- com.google.guava;bundle-version="21.0.0"
-Export-Package: org.eclipse.papyrus.mwe2.utils,
- org.eclipse.papyrus.mwe2.utils.components,
- org.eclipse.papyrus.mwe2.utils.messages
-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.mwe2.utils.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.mwe2.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

+ org.eclipse.emf.mwe.core;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",

+ org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",

+ org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,

+ org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,

+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport

+Export-Package: org.eclipse.papyrus.mwe2.utils,

+ org.eclipse.papyrus.mwe2.utils.components,

+ org.eclipse.papyrus.mwe2.utils.messages

+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.mwe2.utils.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.mwe2.utils;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index d28ea9d4442..dcb115f1543 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- com.google.guava;bundle-version="21.0.0",
  org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)",
  fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional,
  org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0",
@@ -16,3 +15,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.releng.tools;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
index aa6371cdfc1..4f5ab1f23bd 100644
--- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.eclipse.project.editors.file,
- org.eclipse.papyrus.eclipse.project.editors.interfaces,
- org.eclipse.papyrus.eclipse.project.editors.project
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.eclipse.project.editors.file,

+ org.eclipse.papyrus.eclipse.project.editors.interfaces,

+ org.eclipse.papyrus.eclipse.project.editors.project

+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

+ org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 2.0.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
index b2f898fc140..42cb64a130b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider
-Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.emf.facet.util.swt;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.emf.facet.util.jface.ui.imageprovider

+Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",

+ org.eclipse.papyrus.emf.facet.util.swt;bundle-version="[1.2.0,2.0.0)"

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 2.0.0.qualifier

+Bundle-Name: %Bundle-Name

+Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
index 8728226e8c3..049ff8efb74 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported,
- org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported.exception
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
- com.ibm.icu;bundle-version="54.0.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Papyrus EMF Facet PDE Core Utils
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.pde.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported,

+ org.eclipse.papyrus.emf.facet.util.pde.core.internal.exported.exception

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

+ org.eclipse.pde.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

+ org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",

+ com.ibm.icu;bundle-version="54.0.0"

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: Papyrus EMF Facet PDE Core Utils

+Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.pde.core;singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
index ef718fac531..be97a97961d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF
@@ -1,38 +1,38 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.emf.facet.util.ui.internal.exported.composite,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.handler,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.tree.menu,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.composite,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.dialog,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.item,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.menu,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.bounds,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.name,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.query,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.wizard,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget.getorcreate,
- org.eclipse.papyrus.emf.facet.util.ui.internal.exported.wizard,
- org.eclipse.papyrus.emf.facet.util.ui.utils
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.emf.facet.util.ui.internal.exported.composite,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.dialog,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.displaysync,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.handler,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.tree.menu,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.composite,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.dialog,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.handler,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.item,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.tree.menu,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.command,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.getorcreate,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.bounds,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.component.properties.name,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.widget.query,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.util.wizard,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.widget.getorcreate,

+ org.eclipse.papyrus.emf.facet.util.ui.internal.exported.wizard,

+ org.eclipse.papyrus.emf.facet.util.ui.utils

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",

+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

+ org.eclipse.jface;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 2.0.0.qualifier

+Bundle-Name: %Bundle-Name

+Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
index 3718eda0610..86dc1e40c1d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.internal.Activator

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets

+Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
index f52e6251e77..63d93a3d4b7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.core.log
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport

+Export-Package: org.eclipse.papyrus.infra.core.log

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log;singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 60202376f18..f6d621c2349 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -38,3 +38,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.core.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.io;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 367aec58f00..6a1ea76ee09 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -1,22 +1,24 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.tools,
- org.eclipse.papyrus.infra.tools.comparator,
- org.eclipse.papyrus.infra.tools.databinding,
- org.eclipse.papyrus.infra.tools.file,
- org.eclipse.papyrus.infra.tools.notify,
- org.eclipse.papyrus.infra.tools.spi,
- org.eclipse.papyrus.infra.tools.util
-Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- com.google.guava;bundle-version="21.0.0";visibility:=reexport,
- org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="3.11.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
-Eclipse-BuddyPolicy: dependent
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.infra.tools,

+ org.eclipse.papyrus.infra.tools.comparator,

+ org.eclipse.papyrus.infra.tools.databinding,

+ org.eclipse.papyrus.infra.tools.file,

+ org.eclipse.papyrus.infra.tools.notify,

+ org.eclipse.papyrus.infra.tools.spi,

+ org.eclipse.papyrus.infra.tools.util

+Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,

+ org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

+ org.eclipse.core.resources;bundle-version="3.11.0"

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 3.0.0.qualifier

+Eclipse-BuddyPolicy: dependent

+Bundle-Name: %Bundle-Name

+Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0",

+ com.google.common.collect;version="21.0.0",

+ com.google.common.util.concurrent;version="21.0.0"

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
index 3e5ada5cde5..cc1ab5913c4 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Bundle-Localization: plugin

+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
index a3e7d89b555..a3ebe1f365b 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
@@ -18,3 +18,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index 6f8d96309db..89a73d5e7a8 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -1,26 +1,29 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf,

- org.eclipse.papyrus.infra.emf.adapters,

- org.eclipse.papyrus.infra.emf.advice,

- org.eclipse.papyrus.infra.emf.commands,

- org.eclipse.papyrus.infra.emf.edit.domain,

- org.eclipse.papyrus.infra.emf.internal.resource;x-internal:=true,

- org.eclipse.papyrus.infra.emf.internal.resource.index;x-internal:=true,

- org.eclipse.papyrus.infra.emf.requests,

- org.eclipse.papyrus.infra.emf.resource,

- org.eclipse.papyrus.infra.emf.resource.index,

- org.eclipse.papyrus.infra.emf.spi.resolver,

- org.eclipse.papyrus.infra.emf.utils

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: EMF Tools

-Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf,
+ org.eclipse.papyrus.infra.emf.adapters,
+ org.eclipse.papyrus.infra.emf.advice,
+ org.eclipse.papyrus.infra.emf.commands,
+ org.eclipse.papyrus.infra.emf.edit.domain,
+ org.eclipse.papyrus.infra.emf.internal.resource;x-internal:=true,
+ org.eclipse.papyrus.infra.emf.internal.resource.index;x-internal:=true,
+ org.eclipse.papyrus.infra.emf.requests,
+ org.eclipse.papyrus.infra.emf.resource,
+ org.eclipse.papyrus.infra.emf.resource.index,
+ org.eclipse.papyrus.infra.emf.spi.resolver,
+ org.eclipse.papyrus.infra.emf.utils
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: EMF Tools
+Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
index af4027d5957..45ad03b71da 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
@@ -1,29 +1,31 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.ui.emf.adapters,

- org.eclipse.papyrus.infra.ui.emf.databinding,

- org.eclipse.papyrus.infra.ui.emf.dialog,

- org.eclipse.papyrus.infra.ui.emf.providers,

- org.eclipse.papyrus.infra.ui.emf.providers.strategy,

- org.eclipse.papyrus.infra.ui.emf.utils,

- org.eclipse.papyrus.infra.ui.internal.emf;x-internal:=true,

- org.eclipse.papyrus.infra.ui.internal.emf.expressions;x-internal:=true,

- org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers;x-internal:=true

-Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.ui.internal.emf.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.ui.emf.adapters,
+ org.eclipse.papyrus.infra.ui.emf.databinding,
+ org.eclipse.papyrus.infra.ui.emf.dialog,
+ org.eclipse.papyrus.infra.ui.emf.providers,
+ org.eclipse.papyrus.infra.ui.emf.providers.strategy,
+ org.eclipse.papyrus.infra.ui.emf.utils,
+ org.eclipse.papyrus.infra.ui.internal.emf;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.internal.emf.expressions;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.internal.emf.readonly.handlers;x-internal:=true
+Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.ui.internal.emf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF
index 03e5076084e..2c92e944191 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,18 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.handlers;x-internal:=true

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.handlers;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF
index b57ab7728f6..98798ff7fa6 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF
@@ -24,3 +24,5 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
index d1295f3c30c..0af0134cd79 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
@@ -1,17 +1,19 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,

- org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding,

- org.eclipse.papyrus.infra.gmfdiag.css.properties.provider

-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 2.1.0.qualifier

-Bundle-Name: CSS Properties

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,
+ org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding,
+ org.eclipse.papyrus.infra.gmfdiag.css.properties.provider
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.1.0.qualifier
+Bundle-Name: CSS Properties
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index e94321df26b..1bc8d58e6bc 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
index e71987a2482..71b6594cc37 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Name: CSS3 Xtext Editor (UI)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;singleton:=true

 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
index 0bdc4499708..5d5f7ae1952 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=re
  org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",

  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",

  org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",

- org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",

- com.google.guava;bundle-version="21.0.0"

+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,

  org.eclipse.papyrus.infra.gmfdiag.css3.services,

  org.eclipse.papyrus.infra.gmfdiag.css3.cSS,

@@ -32,6 +31,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier

 Bundle-Name: CSS3 Xtext Editor

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext; singleton:=true

-Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)"

+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;singleton:=true

+Import-Package: com.google.common.collect;version="21.0.0",

+ org.apache.log4j;version="[1.2.0,2.0.0)"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
index 97ac0585edf..8fb9f6d9972 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF
@@ -15,3 +15,6 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index c21816886ef..ba6457d58ce 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -79,3 +79,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;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/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
index 2f8e868d68c..10d46f32b6e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 577f5b1cbcb..680e18a9c78 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
index a76735c94d2..7e1064b63ab 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

 Bundle-ActivationPolicy: lazy

+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
index c820e5cf8d4..32f5e98e39b 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF
@@ -1,29 +1,31 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.internationalization,

- org.eclipse.papyrus.infra.internationalization.commands,

- org.eclipse.papyrus.infra.internationalization.helper,

- org.eclipse.papyrus.infra.internationalization.modelresource,

- org.eclipse.papyrus.infra.internationalization.modelsnippet,

- org.eclipse.papyrus.infra.internationalization.resource,

- org.eclipse.papyrus.infra.internationalization.util,

- org.eclipse.papyrus.infra.internationalization.utils

-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",

- 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.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",

- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.papyrus.infra.internationalization.Activator

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.internationalization;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.internationalization,
+ org.eclipse.papyrus.infra.internationalization.commands,
+ org.eclipse.papyrus.infra.internationalization.helper,
+ org.eclipse.papyrus.infra.internationalization.modelresource,
+ org.eclipse.papyrus.infra.internationalization.modelsnippet,
+ org.eclipse.papyrus.infra.internationalization.resource,
+ org.eclipse.papyrus.infra.internationalization.util,
+ org.eclipse.papyrus.infra.internationalization.utils
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
+ 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.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.internationalization.Activator
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
index e33480fe81f..46f3a0a563e 100755
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
@@ -14,3 +14,7 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.reflect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 0283a975388..532cd4073d4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -30,3 +30,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index c416f4ef6d9..3d2d4e672fc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -15,3 +15,5 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 39e3fe17861..e71f0541351 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -76,3 +76,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index a3fa76949a2..9907c056461 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.services.controlmode,
  org.eclipse.papyrus.infra.services.controlmode.internal.ui;x-internal:=true,

  org.eclipse.papyrus.infra.services.controlmode.participants,

  org.eclipse.papyrus.infra.services.controlmode.ui,

- org.eclipse.papyrus.infra.services.controlmode.util;uses:="org.eclipse.emf.ecore"

+ org.eclipse.papyrus.infra.services.controlmode.util

 Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,

@@ -29,3 +29,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlug
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
index 889b7f17f17..f984b5c75ca 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
index 377359a9bda..4a6784d6604 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index 37c381da309..476eadbaeac 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index b867cf92df4..2f454989d64 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
index 0524a75c802..ee01e3da68a 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -43,3 +43,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator
 Bundle-Description: Plugin dedicated to manage generic menus and actions,

  linked to EMF but not to UML nor GMF technologies.

 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.cache;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index 8b19b397b88..9989649bca9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -39,3 +39,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
index 932c33a9473..13dbcdcadeb 100644
--- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
+++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)"
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.emf.edit,

  org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

- com.google.guava;bundle-version="21.0.0",

  org.eclipse.team.core;bundle-version="3.7.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

@@ -20,3 +19,5 @@ Bundle-Activator: org.eclipse.papyrus.team.svn.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.team.svn;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/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
index d3a44ea94db..8b4e23c8163 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
@@ -22,3 +22,5 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
index 925fc3d55bf..44c42f04bc9 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
@@ -17,3 +17,6 @@ Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.properties.Activator
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.properties;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
index ae6740447e8..9bcc833d791 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,7 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;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",
+ com.google.common.eventbus;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
index 459dc1ba81c..294aa3c8480 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
@@ -34,3 +34,6 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;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/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 7fcd1434b38..6878c7d853b 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -60,4 +60,6 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity;singleton:=true

+Import-Package: com.google.common.base;version="21.0.0",

+ com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 4564485484d..bcc2441d2d9 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -86,4 +86,6 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

 Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz;singleton:=true

+Import-Package: com.google.common.base;version="21.0.0",

+ com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index 11d529ef2d6..4b3daaa37f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -13,3 +13,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.customaction.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.customaction;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/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 062d008e179..5f840fcc751 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -94,3 +94,5 @@ Eclipse-BuddyPolicy: dependent
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:=true

+Import-Package: com.google.common.base;version="21.0.0",
+ com.google.common.collect;version="21.0.0"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index 9f16e61291e..16a189cbbd5 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -53,4 +53,5 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication;singleton:=true

+Import-Package: com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index 181616e825c..34b5dd5d1e2 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -58,4 +58,4 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component;singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index c0303f9d64b..e3e146b7eae 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -53,4 +53,4 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite;singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index 9810322b73f..d71d94e1df3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -70,4 +70,4 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment;singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index 124be625d17..556416abcf3 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -36,3 +36,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index 0c6ea8ed04c..6f43442f62b 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -48,4 +48,5 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

 Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile;singleton:=true

+Import-Package: com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 6808c19df58..b535b852b4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -65,4 +65,5 @@ Bundle-Vendor: %providerName
 Bundle-Version: 3.0.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence;singleton:=true

+Import-Package: com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index 56d7f9008a5..a67cca27fa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -71,4 +71,6 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine;singleton:=true

+Import-Package: com.google.common.base;version="21.0.0",

+ com.google.common.collect;version="21.0.0"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 94470b91b11..3a84f9a9cb7 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -46,4 +46,4 @@ Eclipse-LazyStart: true
 Bundle-Version: 1.3.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing;singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index a0d84533742..3dae2a376b6 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -46,4 +46,4 @@ Eclipse-LazyStart: true
 Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase; singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase;singleton:=true

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
index 20f4fe64757..d353e84a379 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets
-Require-Bundle: org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.modelexplorer.widgets

+Require-Bundle: org.eclipse.papyrus.views.modelexplorer.widgets;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 2.0.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets;singleton:=true

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 8eb7e502aa8..5405e43d3b9 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
index 8dabf736ef8..4296f25bc29 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",

+ org.eclipse.papyrus.infra.newchild;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)"

+Export-Package: org.eclipse.papyrus.uml.profile.newchildmenu.generator

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
index 50f15dfc8dc..ce895724086 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance

+Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index edb6dcd166d..3c4234e0a15 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -15,3 +15,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.controlmode.profile.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.controlmode.profile;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/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
index 094b9310063..7b346c6418a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
  org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- com.google.guava;bundle-version="21.0.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
  org.eclipse.papyrus.uml.filters,
@@ -23,3 +22,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index d7bc2c0efc5..bd81f435abe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -23,3 +23,7 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;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",
+ com.google.common.eventbus;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index 7630c6cf92f..49647d1dcbb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.base;version="21.0.0"
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index 955239b718f..9cf866632bf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.service.types.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF
index 7de81ca8cc3..08fbe787c18 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.documentation

+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.documentation;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
index 80ecaa82ca3..314380f83d2 100644
--- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
+++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF
@@ -22,3 +22,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter;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/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
index f971028c2eb..98b295091b4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
@@ -14,3 +14,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;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/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 196b892af11..f3e50da0cb8 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -36,3 +36,5 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Import-Package: com.google.common.collect;version="21.0.0",
+ com.google.common.util.concurrent;version="21.0.0"
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
index c7c61844618..0360c8e6415 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-Vendor: Eclipse Modeling Project
 Bundle-Version: 2.0.0.qualifier

 Bundle-Name: XText integration Core

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core

+Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 1f686f92c27..c6a07a633da 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -34,3 +34,5 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription

 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;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/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF
index 74d80f46186..641e6bb1913 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.google.common.collect;version="21.0.0"
diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
index 961345cc60d..4b5b1f4ab5b 100644
--- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
+++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF
@@ -11,3 +11,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.views.validation.internal.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.views.validation;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"