[Releng] Fix dependency versions

27 files changed, 240 insertions, 216 deletions

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 b6855aeb0cc..44b29b1bae1 100644
--- 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
@@ -89,6 +89,8 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ gramEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

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 f9731a7bb5a..862548ec426 100644
--- 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
@@ -92,6 +92,8 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagra

+ mEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index f3f59855a02..41a3c7c200c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -1,4 +1,11 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

+ org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

+ org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

+ org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

+ org.eclipse.papyrus.uml.diagram.common.groups.preferences,

+ org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

+ org.eclipse.papyrus.uml.diagram.common.groups.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.diagram.ui.properties,

@@ -8,21 +15,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,

- org.eclipse.papyrus.uml.diagram.common.groups.core.utils,

- org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,

- org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,

- org.eclipse.papyrus.uml.diagram.common.groups.preferences,

- org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,

- org.eclipse.papyrus.uml.diagram.common.groups.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 5a1b0af9d35..3226c74e787 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
@@ -1,8 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

- org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

@@ -18,14 +14,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,

+ org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.palette.custo

  maction.Activator

-Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.palette.cu

  stomaction;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 9f3ec2a2f01..88bb0224a6e 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
@@ -1,107 +1,107 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.uml.diagram.common.actions,
- org.eclipse.papyrus.uml.diagram.common.actions.handlers,
- org.eclipse.papyrus.uml.diagram.common.command.wrappers,
- org.eclipse.papyrus.uml.diagram.common.commands,
- org.eclipse.papyrus.uml.diagram.common.dialogs,
- org.eclipse.papyrus.uml.diagram.common.directedit,
- org.eclipse.papyrus.uml.diagram.common.dragtracker,
- org.eclipse.papyrus.uml.diagram.common.draw2d,
- org.eclipse.papyrus.uml.diagram.common.draw2d.anchors,
- org.eclipse.papyrus.uml.diagram.common.editparts,
- org.eclipse.papyrus.uml.diagram.common.editpolicies,
- org.eclipse.papyrus.uml.diagram.common.figure.edge,
- org.eclipse.papyrus.uml.diagram.common.figure.layout,
- org.eclipse.papyrus.uml.diagram.common.figure.node,
- org.eclipse.papyrus.uml.diagram.common.handlers,
- org.eclipse.papyrus.uml.diagram.common.helper,
- org.eclipse.papyrus.uml.diagram.common.ids,
- org.eclipse.papyrus.uml.diagram.common.layout,
- org.eclipse.papyrus.uml.diagram.common.listeners,
- org.eclipse.papyrus.uml.diagram.common.locator,
- org.eclipse.papyrus.uml.diagram.common.parser,
- org.eclipse.papyrus.uml.diagram.common.parser.assist,
- org.eclipse.papyrus.uml.diagram.common.parser.custom,
- org.eclipse.papyrus.uml.diagram.common.parser.lookup,
- org.eclipse.papyrus.uml.diagram.common.parser.packageimport,
- org.eclipse.papyrus.uml.diagram.common.parser.stereotype,
- org.eclipse.papyrus.uml.diagram.common.parser.structural,
- org.eclipse.papyrus.uml.diagram.common.part,
- org.eclipse.papyrus.uml.diagram.common.preferences,
- org.eclipse.papyrus.uml.diagram.common.providers,
- org.eclipse.papyrus.uml.diagram.common.providers.assistant,
- org.eclipse.papyrus.uml.diagram.common.resourceupdate,
- org.eclipse.papyrus.uml.diagram.common.service,
- org.eclipse.papyrus.uml.diagram.common.service.palette,
- org.eclipse.papyrus.uml.diagram.common.sheet,
- org.eclipse.papyrus.uml.diagram.common.ui.dialogs,
- org.eclipse.papyrus.uml.diagram.common.ui.helper,
- org.eclipse.papyrus.uml.diagram.common.util,
- org.eclipse.papyrus.uml.diagram.common.util.functions,
- org.eclipse.papyrus.uml.diagram.common.util.predicates
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.common,

+ org.eclipse.papyrus.uml.diagram.common.actions,

+ org.eclipse.papyrus.uml.diagram.common.actions.handlers,

+ org.eclipse.papyrus.uml.diagram.common.command.wrappers,

+ org.eclipse.papyrus.uml.diagram.common.commands,

+ org.eclipse.papyrus.uml.diagram.common.dialogs,

+ org.eclipse.papyrus.uml.diagram.common.directedit,

+ org.eclipse.papyrus.uml.diagram.common.dragtracker,

+ org.eclipse.papyrus.uml.diagram.common.draw2d,

+ org.eclipse.papyrus.uml.diagram.common.draw2d.anchors,

+ org.eclipse.papyrus.uml.diagram.common.editparts,

+ org.eclipse.papyrus.uml.diagram.common.editpolicies,

+ org.eclipse.papyrus.uml.diagram.common.figure.edge,

+ org.eclipse.papyrus.uml.diagram.common.figure.layout,

+ org.eclipse.papyrus.uml.diagram.common.figure.node,

+ org.eclipse.papyrus.uml.diagram.common.handlers,

+ org.eclipse.papyrus.uml.diagram.common.helper,

+ org.eclipse.papyrus.uml.diagram.common.ids,

+ org.eclipse.papyrus.uml.diagram.common.layout,

+ org.eclipse.papyrus.uml.diagram.common.listeners,

+ org.eclipse.papyrus.uml.diagram.common.locator,

+ org.eclipse.papyrus.uml.diagram.common.parser,

+ org.eclipse.papyrus.uml.diagram.common.parser.assist,

+ org.eclipse.papyrus.uml.diagram.common.parser.custom,

+ org.eclipse.papyrus.uml.diagram.common.parser.lookup,

+ org.eclipse.papyrus.uml.diagram.common.parser.packageimport,

+ org.eclipse.papyrus.uml.diagram.common.parser.stereotype,

+ org.eclipse.papyrus.uml.diagram.common.parser.structural,

+ org.eclipse.papyrus.uml.diagram.common.part,

+ org.eclipse.papyrus.uml.diagram.common.preferences,

+ org.eclipse.papyrus.uml.diagram.common.providers,

+ org.eclipse.papyrus.uml.diagram.common.providers.assistant,

+ org.eclipse.papyrus.uml.diagram.common.resourceupdate,

+ org.eclipse.papyrus.uml.diagram.common.service,

+ org.eclipse.papyrus.uml.diagram.common.service.palette,

+ org.eclipse.papyrus.uml.diagram.common.sheet,

+ org.eclipse.papyrus.uml.diagram.common.ui.dialogs,

+ org.eclipse.papyrus.uml.diagram.common.ui.helper,

+ org.eclipse.papyrus.uml.diagram.common.util,

+ org.eclipse.papyrus.uml.diagram.common.util.functions,

+ org.eclipse.papyrus.uml.diagram.common.util.predicates

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
- org.eclipse.papyrus.editor;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",
- org.eclipse.ui,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.0",
- org.eclipse.gmf.runtime.diagram.ui.printing,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
- org.eclipse.jface,
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.0",
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
- org.w3c.dom.svg,
- org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.core.databinding;bundle-version="1.4.1",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,

+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",

+ org.eclipse.papyrus.editor;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",

+ org.eclipse.ui,

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.diagram.ui.actions,

+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

+ org.eclipse.core.expressions,

+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.diagram.ui.printing,

+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

+ com.google.guava;bundle-version="11.0.0",

+ org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

+ org.eclipse.ui.ide;bundle-version="3.8.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

+ org.eclipse.jface,

+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.0",

+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

+ org.w3c.dom.svg,

+ org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",

+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

+ org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.gmf.tooling.runtime,

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"
-Bundle-Vendor: %providerName
-Ant-Version: Apache Ant 1.7.0
-Bundle-Version: 1.0.0.qualifier
-Eclipse-BuddyPolicy: dependent
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:
- =true
-
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"

+Bundle-Vendor: %providerName

+Ant-Version: Apache Ant 1.7.0

+Bundle-Version: 1.0.0.qualifier

+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

+

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 9511803f965..3296d23cd86 100644
--- 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
@@ -52,9 +52,9 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

-Bundle-ManifestVersion: 2

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

  MLDiagramEditorPlugin

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication;sin

  gleton:=true

 

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 dd5181f3002..d91d79f0d89 100644
--- 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
@@ -59,13 +59,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

  org.eclipse.papyrus.uml.diagram.menu;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ agramEditorPlugin

 Bundle-ManifestVersion: 2

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

-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 b4e6e6f9196..39061024515 100644
--- 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
@@ -68,13 +68,15 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.validation;visibility:=reexport,

  org.eclipse.gef,

  org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ agramEditorPlugin

 Bundle-ManifestVersion: 2

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

-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.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index 674877fd667..4fe5756e826 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: UML-Specific CSS concepts (Incubation)

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.css;singleton:=tr

  ue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 ed78735c02d..0327402ebef 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,6 +70,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ iagramEditorPlugin

 Bundle-ManifestVersion: 2

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

-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.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index 931021c81fc..592e9138492 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -1,4 +1,8 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.dnd,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

+ org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

@@ -12,16 +16,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.dnd,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,

- org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: UML Drag and Drop (Incubation)

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=tr

  ue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index 75d69c6a907..4da3b2ab5ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -1,4 +1,5 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.emftree

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.uml2.uml.editor;bundle-version="4.1.0",

  org.eclipse.core.runtime;bundle-version="3.7.0",

@@ -7,14 +8,13 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.emftree

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

+Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
index 4b4e98583c0..f7d1a2e8c47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Require-Bundle: org.eclipse.ui,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator

+Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator

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

  true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 9b1bf302821..38c94f5ff9a 100644
--- 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
@@ -1,4 +1,18 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.factory,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.figures,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.parser,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.part,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.preferences,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.provider,

+ org.eclipse.papyrus.uml.diagram.interactionoverview.utils

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

@@ -38,32 +52,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.hyperlink;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.dialogs,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.part,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policies,

- org.eclipse.papyrus.uml.diagram.interactionoverview.edit.policy,

- org.eclipse.papyrus.uml.diagram.interactionoverview.factory,

- org.eclipse.papyrus.uml.diagram.interactionoverview.figures,

- org.eclipse.papyrus.uml.diagram.interactionoverview.parser,

- org.eclipse.papyrus.uml.diagram.interactionoverview.part,

- org.eclipse.papyrus.uml.diagram.interactionoverview.preferences,

- org.eclipse.papyrus.uml.diagram.interactionoverview.provider,

- org.eclipse.papyrus.uml.diagram.interactionoverview.utils

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.

  Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionovervi

  ew;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index 85fa3c37216..0406d7e1de9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -1,4 +1,7 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.menu,

+ org.eclipse.papyrus.uml.diagram.menu.actions,

+ org.eclipse.papyrus.uml.diagram.menu.actions.handlers

 Require-Bundle: org.eclipse.ui,

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

@@ -24,16 +27,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.menu,

- org.eclipse.papyrus.uml.diagram.menu.actions,

- org.eclipse.papyrus.uml.diagram.menu.actions.handlers

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=t

  rue

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index d1cddc7b8a8..a075773a0b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -17,16 +17,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0"

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activa

  tor

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;sin

  gleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index 4304cea5112..4f8ed481d18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.navigation

 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.draw2d;bundle-version="3.7.1",

  org.eclipse.jface;bundle-version="3.8.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.navigation

 Bundle-Vendor: %providerName

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;single

  ton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index aa5e48aea01..18b7811c634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -1,25 +1,28 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider

-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.0";visibility:=reexport,

  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.0.0",

  org.eclipse.emf.edit,

  org.eclipse.emf.ecore,

- org.eclipse.emf.ecore.edit,
+ org.eclipse.emf.ecore.edit,

  org.eclipse.uml2.uml,

  org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.emf.facet.efacet.metamodel.edit

+ org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.p

+ rovider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

+ .edit.provider.PaletteConfigurationEditPlugin$Implementation

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit.provider.PaletteConfigurationEditPlugin$Implementation

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

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

+ ion.edit;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index febd02fa499..f87cbe69dff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -1,9 +1,4 @@
 Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,

- org.eclipse.papyrus.uml.diagram.paletteconfiguration.util

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

@@ -18,14 +13,21 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.editor;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,

+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.util

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration

+ .Activator

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator

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

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfigurat

+ ion;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

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 f64cb487ea0..4a23f67730d 100644
--- 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
@@ -84,6 +84,8 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiag

+ ramEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

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 137f52cd889..e4512b9a857 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
@@ -71,12 +71,14 @@ Require-Bundle: org.eclipse.core.expressions,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

 Bundle-ManifestVersion: 2

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

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

+ gramEditorPlugin

 Import-Package: org.eclipse.core.databinding.observable,

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

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

  org.eclipse.papyrus.uml.tools.databinding,

  org.eclipse.papyrus.views.properties.contexts,

  org.eclipse.papyrus.views.properties.modelelement

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

+

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 f7c7333e33f..50d9665406d 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
@@ -84,6 +84,8 @@ Bundle-Vendor: %providerName
 Ant-Version: Apache Ant 1.7.0

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ LDiagramEditorPlugin

 Bundle-ManifestVersion: 2

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

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

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

+

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index aa72b9f1fd2..452d0e580a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -1,4 +1,7 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.command,

+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

@@ -12,17 +15,14 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.profile;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.command,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,

- org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.A

  ctivator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.editio

  n;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 416af96a60a..e68f2f69216 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -1,4 +1,6 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.symbols,

+ org.eclipse.papyrus.uml.diagram.symbols.provider

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime;bundle-version="3.8.0",

  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",

@@ -17,14 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.w3c.dom.svg;bundle-version="1.1.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.symbols,

- org.eclipse.papyrus.uml.diagram.symbols.provider

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

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 6da8da94fb0..90acd9dce7a 100644
--- 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
@@ -73,7 +73,8 @@ Require-Bundle: org.eclipse.emf.ecore,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ amEditorPlugin

 Bundle-ManifestVersion: 2

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

-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 546fcb7082d..4019b95500f 100644
--- 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
@@ -75,6 +75,8 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

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

+ ramEditorPlugin

 Bundle-ManifestVersion: 2

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

-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/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index a94137414af..836b8b967cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -1,4 +1,9 @@
 Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.wizards,

+ org.eclipse.papyrus.uml.diagram.wizards.category,

+ org.eclipse.papyrus.uml.diagram.wizards.kind,

+ org.eclipse.papyrus.uml.diagram.wizards.pages,

+ org.eclipse.papyrus.uml.diagram.wizards.utils

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.emf.edit.ui;bundle-version="2.4.0",

  org.eclipse.emf.ecore.edit;bundle-version="2.4.0",

@@ -16,18 +21,13 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.wizards,

- org.eclipse.papyrus.uml.diagram.wizards.category,

- org.eclipse.papyrus.uml.diagram.wizards.kind,

- org.eclipse.papyrus.uml.diagram.wizards.pages,

- org.eclipse.papyrus.uml.diagram.wizards.utils

 Bundle-Vendor: %pluginProvider

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

+Bundle-Localization: plugin

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator

+Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton

  :=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5